From e11cb0bcd189a355ff5fdaa8ba70afe3d0fc609b Mon Sep 17 00:00:00 2001 From: Jaime Pillora Date: Fri, 17 Feb 2023 13:23:44 +1100 Subject: [PATCH] support go get and go install, closes #13 --- cmd/cmd_api.go | 81 +- cmd/cmd_data.go | 11 +- cmd/cmd_ha.go | 13 +- cmd/cmd_info.go | 4 +- cmd/cmd_mqtt.go | 113 +- cmd/cmd_show_meta.go | 5 +- cmd/cmd_show_psid.go | 11 +- cmd/commands.go | 22 +- example/example.go | 73 +- go.mod | 2 +- .../msgDownwardStatusReceipt/data.go | 6 +- .../msgDownwardStatusReceipt/struct.go | 17 +- iSolarCloud/AliSmsService/struct.go | 8 +- .../AppService/acceptPsSharing/data.go | 7 +- .../AppService/acceptPsSharing/struct.go | 17 +- iSolarCloud/AppService/activateEmail/data.go | 7 +- .../AppService/activateEmail/struct.go | 17 +- iSolarCloud/AppService/addConfig/data.go | 8 +- iSolarCloud/AppService/addConfig/struct.go | 17 +- .../AppService/addDeviceRepair/data.go | 8 +- .../AppService/addDeviceRepair/struct.go | 17 +- .../addDeviceToStructureForHousehold/data.go | 8 +- .../struct.go | 17 +- .../data.go | 6 +- .../struct.go | 17 +- iSolarCloud/AppService/addFault/data.go | 8 +- iSolarCloud/AppService/addFault/struct.go | 17 +- iSolarCloud/AppService/addFaultOrder/data.go | 8 +- .../AppService/addFaultOrder/struct.go | 17 +- iSolarCloud/AppService/addFaultPlan/data.go | 8 +- iSolarCloud/AppService/addFaultPlan/struct.go | 17 +- .../AppService/addFaultRepairSteps/data.go | 8 +- .../AppService/addFaultRepairSteps/struct.go | 17 +- .../AppService/addHouseholdEvaluation/data.go | 8 +- .../addHouseholdEvaluation/struct.go | 17 +- .../addHouseholdLeaveMessage/data.go | 8 +- .../addHouseholdLeaveMessage/struct.go | 17 +- .../addHouseholdOpinionFeedback/data.go | 8 +- .../addHouseholdOpinionFeedback/struct.go | 17 +- .../AppService/addHouseholdWorkOrder/data.go | 8 +- .../addHouseholdWorkOrder/struct.go | 17 +- iSolarCloud/AppService/addOnDutyInfo/data.go | 8 +- .../AppService/addOnDutyInfo/struct.go | 17 +- iSolarCloud/AppService/addOperRule/data.go | 8 +- iSolarCloud/AppService/addOperRule/struct.go | 17 +- .../AppService/addOrDelPsStructure/data.go | 8 +- .../AppService/addOrDelPsStructure/struct.go | 17 +- iSolarCloud/AppService/addOrderStep/data.go | 8 +- iSolarCloud/AppService/addOrderStep/struct.go | 17 +- .../addPowerStationForHousehold/data.go | 8 +- .../addPowerStationForHousehold/struct.go | 17 +- .../AppService/addPowerStationInfo/data.go | 8 +- .../AppService/addPowerStationInfo/struct.go | 17 +- .../AppService/addReportConfigEmail/data.go | 8 +- .../AppService/addReportConfigEmail/struct.go | 17 +- .../AppService/addSysAdvancedParam/data.go | 8 +- .../AppService/addSysAdvancedParam/struct.go | 17 +- iSolarCloud/AppService/addSysOrgNew/data.go | 8 +- iSolarCloud/AppService/addSysOrgNew/struct.go | 17 +- iSolarCloud/AppService/aliPayAppTest/data.go | 8 +- .../AppService/aliPayAppTest/struct.go | 17 +- iSolarCloud/AppService/auditOperRule/data.go | 8 +- .../AppService/auditOperRule/struct.go | 17 +- .../AppService/batchAddStationBySn/data.go | 8 +- .../AppService/batchAddStationBySn/struct.go | 17 +- iSolarCloud/AppService/batchImportSN/data.go | 8 +- .../AppService/batchImportSN/struct.go | 17 +- .../AppService/batchInsertUserAndOrg/data.go | 8 +- .../batchInsertUserAndOrg/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../batchProcessPlantReport/data.go | 8 +- .../batchProcessPlantReport/struct.go | 17 +- .../AppService/batchUpdateDeviceSim/data.go | 8 +- .../AppService/batchUpdateDeviceSim/struct.go | 17 +- .../batchUpdateUserIsAgreeGdpr/data.go | 8 +- .../batchUpdateUserIsAgreeGdpr/struct.go | 17 +- .../AppService/boundMobilePhone/data.go | 8 +- .../AppService/boundMobilePhone/struct.go | 17 +- iSolarCloud/AppService/boundUserMail/data.go | 8 +- .../AppService/boundUserMail/struct.go | 17 +- .../caculateDeviceInputDiscrete/data.go | 8 +- .../caculateDeviceInputDiscrete/struct.go | 17 +- .../calculateDeviceDiscrete/data.go | 6 +- .../calculateDeviceDiscrete/struct.go | 17 +- .../calculateInitialCompensationData/data.go | 8 +- .../struct.go | 17 +- .../AppService/cancelDeliverMail/data.go | 8 +- .../AppService/cancelDeliverMail/struct.go | 17 +- .../AppService/cancelOrderScan/data.go | 8 +- .../AppService/cancelOrderScan/struct.go | 17 +- .../AppService/cancelParamSetTask/data.go | 8 +- .../AppService/cancelParamSetTask/struct.go | 17 +- .../AppService/cancelPsSharing/data.go | 8 +- .../AppService/cancelPsSharing/struct.go | 17 +- .../AppService/cancelRechargeOrder/data.go | 8 +- .../AppService/cancelRechargeOrder/struct.go | 17 +- .../changRechargeOrderToCancel/data.go | 8 +- .../changRechargeOrderToCancel/struct.go | 17 +- .../changeHouseholdUser2Installer/data.go | 8 +- .../changeHouseholdUser2Installer/struct.go | 17 +- .../AppService/changeRemoteParam/data.go | 7 +- .../AppService/changeRemoteParam/struct.go | 17 +- .../AppService/checkDealerOrgCode/data.go | 8 +- .../AppService/checkDealerOrgCode/struct.go | 17 +- .../checkDevSnIsBelongsToUser/data.go | 8 +- .../checkDevSnIsBelongsToUser/struct.go | 17 +- .../AppService/checkInverterResult/data.go | 8 +- .../AppService/checkInverterResult/struct.go | 17 +- .../AppService/checkIsCanDoParamSet/data.go | 8 +- .../AppService/checkIsCanDoParamSet/struct.go | 17 +- iSolarCloud/AppService/checkIsIvScan/data.go | 8 +- .../AppService/checkIsIvScan/struct.go | 17 +- .../AppService/checkOssObjectExist/data.go | 8 +- .../AppService/checkOssObjectExist/struct.go | 17 +- .../AppService/checkServiceIsConnect/data.go | 8 +- .../checkServiceIsConnect/struct.go | 17 +- .../checkTechnicalParameters/data.go | 8 +- .../checkTechnicalParameters/struct.go | 17 +- .../AppService/checkUnitStatus/data.go | 7 +- .../AppService/checkUnitStatus/struct.go | 17 +- .../checkUpRechargeDevicePaying/data.go | 8 +- .../checkUpRechargeDevicePaying/struct.go | 17 +- .../AppService/checkUserAccountUnique/data.go | 8 +- .../checkUserAccountUnique/struct.go | 17 +- .../checkUserAccountUniqueAll/data.go | 8 +- .../checkUserAccountUniqueAll/struct.go | 17 +- .../AppService/checkUserInfoUnique/data.go | 8 +- .../AppService/checkUserInfoUnique/struct.go | 17 +- .../AppService/checkUserIsExist/data.go | 8 +- .../AppService/checkUserIsExist/struct.go | 17 +- .../AppService/checkUserListIsExist/data.go | 8 +- .../AppService/checkUserListIsExist/struct.go | 17 +- .../AppService/checkUserPassword/data.go | 8 +- .../AppService/checkUserPassword/struct.go | 17 +- .../AppService/cloudDeploymentRecord/data.go | 8 +- .../cloudDeploymentRecord/struct.go | 17 +- .../AppService/comfirmParamModel/data.go | 8 +- .../AppService/comfirmParamModel/struct.go | 17 +- .../communicationModuleDetail/data.go | 9 +- .../communicationModuleDetail/struct.go | 17 +- .../AppService/compareValidateCode/data.go | 8 +- .../AppService/compareValidateCode/struct.go | 17 +- .../AppService/componentInfo2Cloud/data.go | 8 +- .../AppService/componentInfo2Cloud/struct.go | 17 +- iSolarCloud/AppService/confirmFault/data.go | 8 +- iSolarCloud/AppService/confirmFault/struct.go | 17 +- iSolarCloud/AppService/confirmIvFault/data.go | 8 +- .../AppService/confirmIvFault/struct.go | 17 +- .../AppService/confirmReportConfig/data.go | 8 +- .../AppService/confirmReportConfig/struct.go | 17 +- .../AppService/createAppkeyInfo/data.go | 8 +- .../AppService/createAppkeyInfo/struct.go | 17 +- .../AppService/createRenewInvoice/data.go | 8 +- .../AppService/createRenewInvoice/struct.go | 17 +- .../AppService/dealCommandReply/data.go | 8 +- .../AppService/dealCommandReply/struct.go | 17 +- .../dealDeletePsFailPsDelete/data.go | 8 +- .../dealDeletePsFailPsDelete/struct.go | 17 +- .../dealFailRemoteUpgradeSubTasks/data.go | 8 +- .../dealFailRemoteUpgradeSubTasks/struct.go | 17 +- .../dealFailRemoteUpgradeTasks/data.go | 8 +- .../dealFailRemoteUpgradeTasks/struct.go | 17 +- iSolarCloud/AppService/dealFaultOrder/data.go | 8 +- .../AppService/dealFaultOrder/struct.go | 17 +- .../dealGroupStringDisableOrEnable/data.go | 8 +- .../dealGroupStringDisableOrEnable/struct.go | 17 +- .../dealNumberOfServiceCalls2Mysql/data.go | 8 +- .../dealNumberOfServiceCalls2Mysql/struct.go | 17 +- .../dealParamSettingAfterComplete/data.go | 8 +- .../dealParamSettingAfterComplete/struct.go | 17 +- .../AppService/dealPsDataSupplement/data.go | 8 +- .../AppService/dealPsDataSupplement/struct.go | 17 +- .../AppService/dealPsReportEmailSend/data.go | 8 +- .../dealPsReportEmailSend/struct.go | 17 +- .../AppService/dealRemoteUpgrade/data.go | 8 +- .../AppService/dealRemoteUpgrade/struct.go | 17 +- .../AppService/dealSnElectrifyCheck/data.go | 8 +- .../AppService/dealSnElectrifyCheck/struct.go | 17 +- .../dealSysDeviceSimFlowInfo/data.go | 8 +- .../dealSysDeviceSimFlowInfo/struct.go | 17 +- .../AppService/dealSysDeviceSimInfo/data.go | 8 +- .../AppService/dealSysDeviceSimInfo/struct.go | 17 +- .../definiteTimeDealSnExpRemind/data.go | 8 +- .../definiteTimeDealSnExpRemind/struct.go | 17 +- .../definiteTimeDealSnStatus/data.go | 8 +- .../definiteTimeDealSnStatus/struct.go | 17 +- .../AppService/delDeviceRepair/data.go | 8 +- .../AppService/delDeviceRepair/struct.go | 17 +- iSolarCloud/AppService/delOperRule/data.go | 8 +- iSolarCloud/AppService/delOperRule/struct.go | 17 +- .../delayCallApiResidueTimes/data.go | 8 +- .../delayCallApiResidueTimes/struct.go | 17 +- .../AppService/deleteComponent/data.go | 8 +- .../AppService/deleteComponent/struct.go | 17 +- .../AppService/deleteCustomerEmployee/data.go | 8 +- .../deleteCustomerEmployee/struct.go | 17 +- .../AppService/deleteDeviceAccount/data.go | 8 +- .../AppService/deleteDeviceAccount/struct.go | 17 +- .../AppService/deleteDeviceSimById/data.go | 8 +- .../AppService/deleteDeviceSimById/struct.go | 17 +- .../deleteElectricitySettlementData/data.go | 8 +- .../deleteElectricitySettlementData/struct.go | 17 +- .../AppService/deleteFaultPlan/data.go | 8 +- .../AppService/deleteFaultPlan/struct.go | 17 +- .../AppService/deleteFirmwareFiles/data.go | 8 +- .../AppService/deleteFirmwareFiles/struct.go | 17 +- .../deleteHouseholdEvaluation/data.go | 8 +- .../deleteHouseholdEvaluation/struct.go | 17 +- .../deleteHouseholdLeaveMessage/data.go | 8 +- .../deleteHouseholdLeaveMessage/struct.go | 17 +- .../deleteHouseholdWorkOrder/data.go | 8 +- .../deleteHouseholdWorkOrder/struct.go | 17 +- .../deleteInverterSnInChnnl/data.go | 8 +- .../deleteInverterSnInChnnl/struct.go | 17 +- .../AppService/deleteModuleLog/data.go | 8 +- .../AppService/deleteModuleLog/struct.go | 17 +- .../AppService/deleteOnDutyInfo/data.go | 8 +- .../AppService/deleteOnDutyInfo/struct.go | 17 +- .../AppService/deleteOperateBillFile/data.go | 8 +- .../deleteOperateBillFile/struct.go | 17 +- .../AppService/deleteOssObject/data.go | 8 +- .../AppService/deleteOssObject/struct.go | 17 +- .../deletePowerDevicePointById/data.go | 8 +- .../deletePowerDevicePointById/struct.go | 17 +- .../AppService/deletePowerPicture/data.go | 8 +- .../AppService/deletePowerPicture/struct.go | 17 +- .../deletePowerRobotInfoBySnAndPsId/data.go | 8 +- .../deletePowerRobotInfoBySnAndPsId/struct.go | 17 +- .../deletePowerRobotSweepStrategy/data.go | 8 +- .../deletePowerRobotSweepStrategy/struct.go | 17 +- .../AppService/deleteProductionData/data.go | 8 +- .../AppService/deleteProductionData/struct.go | 17 +- iSolarCloud/AppService/deletePs/data.go | 8 +- iSolarCloud/AppService/deletePs/struct.go | 17 +- .../AppService/deleteRechargeOrder/data.go | 8 +- .../AppService/deleteRechargeOrder/struct.go | 17 +- .../deleteRegularlyConnectionInfo/data.go | 8 +- .../deleteRegularlyConnectionInfo/struct.go | 17 +- .../deleteReportConfigEmailAddr/data.go | 8 +- .../deleteReportConfigEmailAddr/struct.go | 17 +- .../AppService/deleteSysAdvancedParam/data.go | 8 +- .../deleteSysAdvancedParam/struct.go | 17 +- .../AppService/deleteSysOrgNew/data.go | 8 +- .../AppService/deleteSysOrgNew/struct.go | 17 +- iSolarCloud/AppService/deleteTemplate/data.go | 8 +- .../AppService/deleteTemplate/struct.go | 17 +- .../deleteUserInfoAllByUserId/data.go | 8 +- .../deleteUserInfoAllByUserId/struct.go | 17 +- .../deviceInputDiscreteDeleteTime/data.go | 8 +- .../deviceInputDiscreteDeleteTime/struct.go | 17 +- .../deviceInputDiscreteGetTime/data.go | 8 +- .../deviceInputDiscreteGetTime/struct.go | 17 +- .../deviceInputDiscreteInsertTime/data.go | 8 +- .../deviceInputDiscreteInsertTime/struct.go | 17 +- .../deviceInputDiscreteUpdateTime/data.go | 8 +- .../deviceInputDiscreteUpdateTime/struct.go | 17 +- .../devicePointsDataFromMySql/data.go | 80 +- .../devicePointsDataFromMySql/struct.go | 17 +- iSolarCloud/AppService/deviceReplace/data.go | 8 +- .../AppService/deviceReplace/struct.go | 17 +- .../AppService/editDeviceRepair/data.go | 8 +- .../AppService/editDeviceRepair/struct.go | 17 +- iSolarCloud/AppService/editOperRule/data.go | 8 +- iSolarCloud/AppService/editOperRule/struct.go | 17 +- .../energyPovertyAlleviation/data.go | 8 +- .../energyPovertyAlleviation/struct.go | 17 +- iSolarCloud/AppService/energyTrend/data.go | 8 +- iSolarCloud/AppService/energyTrend/struct.go | 17 +- .../exportParamSettingValPDF/data.go | 13 +- .../exportParamSettingValPDF/struct.go | 17 +- .../AppService/exportPlantReportPDF/data.go | 11 +- .../AppService/exportPlantReportPDF/struct.go | 17 +- iSolarCloud/AppService/faultAutoClose/data.go | 8 +- .../AppService/faultAutoClose/struct.go | 17 +- .../faultCloseRemindOrderHandler/data.go | 8 +- .../faultCloseRemindOrderHandler/struct.go | 17 +- .../AppService/findCodeValueList/data.go | 8 +- .../AppService/findCodeValueList/struct.go | 17 +- iSolarCloud/AppService/findEmgOrgInfo/data.go | 8 +- .../AppService/findEmgOrgInfo/struct.go | 17 +- .../AppService/findEnvironmentInfo/data.go | 10 +- .../AppService/findEnvironmentInfo/struct.go | 17 +- .../AppService/findFromHbaseAndRedis/data.go | 8 +- .../findFromHbaseAndRedis/struct.go | 17 +- iSolarCloud/AppService/findInfoByuuid/data.go | 8 +- .../AppService/findInfoByuuid/struct.go | 17 +- .../AppService/findLossAnalysisList/data.go | 8 +- .../AppService/findLossAnalysisList/struct.go | 17 +- iSolarCloud/AppService/findOnDutyInfo/data.go | 8 +- .../AppService/findOnDutyInfo/struct.go | 17 +- iSolarCloud/AppService/findPsType/data.go | 7 +- iSolarCloud/AppService/findPsType/struct.go | 17 +- .../AppService/findSingleStationPR/data.go | 8 +- .../AppService/findSingleStationPR/struct.go | 17 +- .../AppService/findUserPassword/data.go | 8 +- .../AppService/findUserPassword/struct.go | 17 +- .../genTLSUserSigByUserAccount/data.go | 8 +- .../genTLSUserSigByUserAccount/struct.go | 17 +- .../AppService/generateRandomPassword/data.go | 8 +- .../generateRandomPassword/struct.go | 17 +- .../AppService/getAPIServiceInfo/data.go | 8 +- .../AppService/getAPIServiceInfo/struct.go | 17 +- .../AppService/getAccessedPermission/data.go | 8 +- .../getAccessedPermission/struct.go | 17 +- .../AppService/getAllDeviceByPsId/data.go | 8 +- .../AppService/getAllDeviceByPsId/struct.go | 17 +- .../getAllPowerDeviceSetName/data.go | 15 +- .../getAllPowerDeviceSetName/struct.go | 17 +- .../getAllPowerRobotViewInfoByPsId/data.go | 10 +- .../getAllPowerRobotViewInfoByPsId/struct.go | 17 +- .../AppService/getAllPsIdByOrgIds/data.go | 10 +- .../AppService/getAllPsIdByOrgIds/struct.go | 17 +- .../AppService/getAllUserRemindCount/data.go | 6 +- .../getAllUserRemindCount/struct.go | 17 +- .../AppService/getAndOutletsAndUnit/data.go | 8 +- .../AppService/getAndOutletsAndUnit/struct.go | 17 +- .../AppService/getApiCallsForAppkeys/data.go | 6 +- .../getApiCallsForAppkeys/struct.go | 17 +- .../getAreaInfoCodeByCounty/data.go | 8 +- .../getAreaInfoCodeByCounty/struct.go | 17 +- iSolarCloud/AppService/getAreaList/data.go | 9 +- iSolarCloud/AppService/getAreaList/struct.go | 17 +- .../getAutoCreatePowerStation/data.go | 8 +- .../getAutoCreatePowerStation/struct.go | 17 +- .../AppService/getBackReadValue/data.go | 8 +- .../AppService/getBackReadValue/struct.go | 17 +- .../getBatchNewestPointData/data.go | 8 +- .../getBatchNewestPointData/struct.go | 17 +- .../AppService/getCallApiResidueTimes/data.go | 8 +- .../getCallApiResidueTimes/struct.go | 17 +- .../AppService/getChangedPsListByTime/data.go | 8 +- .../getChangedPsListByTime/struct.go | 17 +- .../AppService/getChnnlListByPsId/data.go | 9 +- .../AppService/getChnnlListByPsId/struct.go | 17 +- iSolarCloud/AppService/getCloudList/data.go | 97 +- iSolarCloud/AppService/getCloudList/struct.go | 17 +- .../getCloudServiceMappingConfig/data.go | 8 +- .../getCloudServiceMappingConfig/struct.go | 17 +- .../getCommunicationDeviceConfigInfo/data.go | 12 +- .../struct.go | 17 +- .../getCommunicationModuleMonitorData/data.go | 8 +- .../struct.go | 17 +- .../getComponentModelFactory/data.go | 8 +- .../getComponentModelFactory/struct.go | 17 +- iSolarCloud/AppService/getConfigList/data.go | 7 +- .../AppService/getConfigList/struct.go | 17 +- .../getConnectionInfoBySnAndLocalPort/data.go | 8 +- .../struct.go | 17 +- iSolarCloud/AppService/getCountDown/data.go | 8 +- iSolarCloud/AppService/getCountDown/struct.go | 17 +- .../AppService/getCountryServiceInfo/data.go | 8 +- .../getCountryServiceInfo/struct.go | 17 +- iSolarCloud/AppService/getCounty/data.go | 8 +- iSolarCloud/AppService/getCounty/struct.go | 17 +- .../AppService/getCustomerEmployee/data.go | 8 +- .../AppService/getCustomerEmployee/struct.go | 17 +- .../AppService/getCustomerList/data.go | 17 +- .../AppService/getCustomerList/struct.go | 17 +- .../AppService/getDataFromHBase/data.go | 8 +- .../AppService/getDataFromHBase/struct.go | 17 +- .../getDataFromHbaseByRowKey/data.go | 8 +- .../getDataFromHbaseByRowKey/struct.go | 17 +- .../getDevInstalledPowerByPsId/data.go | 6 +- .../getDevInstalledPowerByPsId/struct.go | 17 +- iSolarCloud/AppService/getDevRecord/data.go | 8 +- iSolarCloud/AppService/getDevRecord/struct.go | 17 +- .../AppService/getDevRunRecordList/data.go | 8 +- .../AppService/getDevRunRecordList/struct.go | 17 +- .../AppService/getDevSimByList/data.go | 8 +- .../AppService/getDevSimByList/struct.go | 17 +- iSolarCloud/AppService/getDevSimList/data.go | 8 +- .../AppService/getDevSimList/struct.go | 17 +- .../AppService/getDeviceAccountById/data.go | 8 +- .../AppService/getDeviceAccountById/struct.go | 17 +- .../getDeviceFaultStatisticsData/data.go | 8 +- .../getDeviceFaultStatisticsData/struct.go | 17 +- iSolarCloud/AppService/getDeviceInfo/data.go | 5 +- .../AppService/getDeviceInfo/struct.go | 17 +- iSolarCloud/AppService/getDeviceList/data.go | 102 +- .../AppService/getDeviceList/struct.go | 17 +- .../AppService/getDeviceModelInfoList/data.go | 25 +- .../getDeviceModelInfoList/struct.go | 17 +- .../getDevicePointMinuteDataList/data.go | 20 +- .../getDevicePointMinuteDataList/struct.go | 17 +- .../AppService/getDevicePoints/data.go | 7 +- .../AppService/getDevicePoints/struct.go | 17 +- .../AppService/getDevicePropertys/data.go | 8 +- .../AppService/getDevicePropertys/struct.go | 17 +- .../AppService/getDeviceRepairDetail/data.go | 8 +- .../getDeviceRepairDetail/struct.go | 17 +- .../getDeviceTechBranchCount/data.go | 8 +- .../getDeviceTechBranchCount/struct.go | 17 +- .../AppService/getDeviceTypeInfoList/data.go | 17 +- .../getDeviceTypeInfoList/struct.go | 17 +- .../AppService/getDeviceTypeList/data.go | 14 +- .../AppService/getDeviceTypeList/struct.go | 25 +- iSolarCloud/AppService/getDstInfo/data.go | 8 +- iSolarCloud/AppService/getDstInfo/struct.go | 17 +- .../getElectricitySettlementData/data.go | 8 +- .../getElectricitySettlementData/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../AppService/getEncryptPublicKey/data.go | 6 +- .../AppService/getEncryptPublicKey/struct.go | 17 +- iSolarCloud/AppService/getFaultCount/data.go | 10 +- .../AppService/getFaultCount/struct.go | 17 +- iSolarCloud/AppService/getFaultDetail/data.go | 8 +- .../AppService/getFaultDetail/struct.go | 17 +- .../AppService/getFaultMsgByFaultCode/data.go | 8 +- .../getFaultMsgByFaultCode/struct.go | 17 +- .../getFaultMsgListByPageWithYYYYMM/data.go | 8 +- .../getFaultMsgListByPageWithYYYYMM/struct.go | 17 +- .../getFaultMsgListWithYYYYMM/data.go | 32 +- .../getFaultMsgListWithYYYYMM/struct.go | 17 +- .../AppService/getFaultPlanList/data.go | 8 +- .../AppService/getFaultPlanList/struct.go | 17 +- .../getFileOperationRecordOne/data.go | 8 +- .../getFileOperationRecordOne/struct.go | 17 +- .../getFormulaFaultAnalyseList/data.go | 8 +- .../getFormulaFaultAnalyseList/struct.go | 17 +- .../getGroupStringCheckResult/data.go | 8 +- .../getGroupStringCheckResult/struct.go | 17 +- .../getGroupStringCheckRule/data.go | 8 +- .../getGroupStringCheckRule/struct.go | 17 +- iSolarCloud/AppService/getHisData/data.go | 8 +- iSolarCloud/AppService/getHisData/struct.go | 17 +- iSolarCloud/AppService/getHistoryInfo/data.go | 9 +- .../AppService/getHistoryInfo/struct.go | 17 +- .../AppService/getHouseholdEvaluation/data.go | 8 +- .../getHouseholdEvaluation/struct.go | 17 +- .../getHouseholdLeaveMessage/data.go | 8 +- .../getHouseholdLeaveMessage/struct.go | 17 +- .../getHouseholdOpinionFeedback/data.go | 8 +- .../getHouseholdOpinionFeedback/struct.go | 17 +- .../getHouseholdPsInstallerByUserId/data.go | 8 +- .../getHouseholdPsInstallerByUserId/struct.go | 17 +- .../getHouseholdStoragePsReport/data.go | 375 +++-- .../getHouseholdStoragePsReport/struct.go | 17 +- .../AppService/getHouseholdUserInfo/data.go | 8 +- .../AppService/getHouseholdUserInfo/struct.go | 17 +- .../getHouseholdWorkOrderInfo/data.go | 8 +- .../getHouseholdWorkOrderInfo/struct.go | 17 +- .../getHouseholdWorkOrderList/data.go | 8 +- .../getHouseholdWorkOrderList/struct.go | 17 +- .../AppService/getI18nConfigByType/data.go | 8 +- .../AppService/getI18nConfigByType/struct.go | 17 +- .../AppService/getI18nFileInfo/data.go | 8 +- .../AppService/getI18nFileInfo/struct.go | 17 +- .../AppService/getI18nInfoByKey/data.go | 8 +- .../AppService/getI18nInfoByKey/struct.go | 17 +- iSolarCloud/AppService/getI18nVersion/data.go | 8 +- .../AppService/getI18nVersion/struct.go | 17 +- .../AppService/getIncomeSettingInfos/data.go | 11 +- .../getIncomeSettingInfos/struct.go | 17 +- .../AppService/getInfoFromAMap/data.go | 8 +- .../AppService/getInfoFromAMap/struct.go | 17 +- .../AppService/getInfomationFromRedis/data.go | 8 +- .../getInfomationFromRedis/struct.go | 17 +- .../AppService/getInstallInfoList/data.go | 18 +- .../AppService/getInstallInfoList/struct.go | 17 +- .../data.go | 7 +- .../struct.go | 17 +- .../AppService/getInvertDataList/data.go | 5 +- .../AppService/getInvertDataList/struct.go | 17 +- .../AppService/getInverterDataCount/data.go | 8 +- .../AppService/getInverterDataCount/struct.go | 17 +- .../AppService/getInverterProcess/data.go | 8 +- .../AppService/getInverterProcess/struct.go | 17 +- .../getInverterUuidBytotalId/data.go | 8 +- .../getInverterUuidBytotalId/struct.go | 17 +- .../AppService/getIvEchartsData/data.go | 8 +- .../AppService/getIvEchartsData/struct.go | 17 +- .../AppService/getIvEchartsDataById/data.go | 8 +- .../AppService/getIvEchartsDataById/struct.go | 17 +- iSolarCloud/AppService/getKpiInfo/data.go | 51 +- iSolarCloud/AppService/getKpiInfo/struct.go | 17 +- .../AppService/getListMiFromHBase/data.go | 8 +- .../AppService/getListMiFromHBase/struct.go | 17 +- iSolarCloud/AppService/getMapInfo/data.go | 5 +- iSolarCloud/AppService/getMapInfo/struct.go | 17 +- .../AppService/getMapMiFromHBase/data.go | 8 +- .../AppService/getMapMiFromHBase/struct.go | 17 +- .../AppService/getMenuAndPrivileges/data.go | 8 +- .../AppService/getMenuAndPrivileges/struct.go | 17 +- .../getMicrogridEStoragePsReport/data.go | 8 +- .../getMicrogridEStoragePsReport/struct.go | 17 +- .../AppService/getModuleLogInfo/data.go | 8 +- .../AppService/getModuleLogInfo/struct.go | 17 +- .../AppService/getModuleLogTaskList/data.go | 9 +- .../AppService/getModuleLogTaskList/struct.go | 17 +- .../AppService/getNationProvJSON/data.go | 8 +- .../AppService/getNationProvJSON/struct.go | 17 +- .../getNeedOpAsynOpRecordList/data.go | 8 +- .../getNeedOpAsynOpRecordList/struct.go | 17 +- iSolarCloud/AppService/getNoticeInfo/data.go | 8 +- .../AppService/getNoticeInfo/struct.go | 17 +- .../getNumberOfServiceCalls/data.go | 8 +- .../getNumberOfServiceCalls/struct.go | 17 +- iSolarCloud/AppService/getOSSConfig/data.go | 28 +- iSolarCloud/AppService/getOSSConfig/struct.go | 17 +- .../AppService/getOperRuleDetail/data.go | 8 +- .../AppService/getOperRuleDetail/struct.go | 17 +- .../AppService/getOperateBillFileId/data.go | 8 +- .../AppService/getOperateBillFileId/struct.go | 17 +- .../getOperateTicketForDetail/data.go | 8 +- .../getOperateTicketForDetail/struct.go | 17 +- .../getOrCreateNetEaseUserToken/data.go | 8 +- .../getOrCreateNetEaseUserToken/struct.go | 17 +- .../AppService/getOrderDataList/data.go | 8 +- .../AppService/getOrderDataList/struct.go | 17 +- .../AppService/getOrderDataSql2/data.go | 8 +- .../AppService/getOrderDataSql2/struct.go | 17 +- iSolarCloud/AppService/getOrderDatas/data.go | 8 +- .../AppService/getOrderDatas/struct.go | 17 +- iSolarCloud/AppService/getOrderDetail/data.go | 8 +- .../AppService/getOrderDetail/struct.go | 17 +- .../AppService/getOrderStatistics/data.go | 12 +- .../AppService/getOrderStatistics/struct.go | 17 +- .../AppService/getOrgIdNameByUserId/data.go | 8 +- .../AppService/getOrgIdNameByUserId/struct.go | 17 +- .../getOrgInfoByDealerOrgCode/data.go | 8 +- .../getOrgInfoByDealerOrgCode/struct.go | 17 +- .../AppService/getOrgListByName/data.go | 9 +- .../AppService/getOrgListByName/struct.go | 17 +- .../AppService/getOrgListByUserId/data.go | 16 +- .../AppService/getOrgListByUserId/struct.go | 17 +- .../AppService/getOrgListForUser/data.go | 11 +- .../AppService/getOrgListForUser/struct.go | 17 +- .../AppService/getOssObjectStream/data.go | 12 +- .../AppService/getOssObjectStream/struct.go | 17 +- .../getOwnerFaultConfigList/data.go | 17 +- .../getOwnerFaultConfigList/struct.go | 17 +- .../AppService/getPListinfoFromMysql/data.go | 10 +- .../getPListinfoFromMysql/struct.go | 17 +- .../getParamSetTemplate4NewProtocol/data.go | 8 +- .../getParamSetTemplate4NewProtocol/struct.go | 17 +- .../getParamSetTemplatePointInfo/data.go | 12 +- .../getParamSetTemplatePointInfo/struct.go | 17 +- .../AppService/getParamterSettingBase/data.go | 8 +- .../getParamterSettingBase/struct.go | 17 +- iSolarCloud/AppService/getPhotoInfo/data.go | 8 +- iSolarCloud/AppService/getPhotoInfo/struct.go | 17 +- .../AppService/getPlanedOrNotPsList/data.go | 8 +- .../AppService/getPlanedOrNotPsList/struct.go | 17 +- .../AppService/getPlantReportPDFList/data.go | 6 +- .../getPlantReportPDFList/struct.go | 17 +- .../getPowerChargeSettingInfo/data.go | 7 +- .../getPowerChargeSettingInfo/struct.go | 17 +- .../getPowerDeviceModelTechList/data.go | 17 +- .../getPowerDeviceModelTechList/struct.go | 17 +- .../getPowerDeviceModelTree/data.go | 8 +- .../getPowerDeviceModelTree/struct.go | 17 +- .../getPowerDevicePointInfo/data.go | 28 +- .../getPowerDevicePointInfo/struct.go | 21 +- .../getPowerDevicePointNames/data.go | 14 +- .../getPowerDevicePointNames/struct.go | 17 +- .../getPowerDeviceSetTaskDetailList/data.go | 19 +- .../getPowerDeviceSetTaskDetailList/struct.go | 17 +- .../getPowerDeviceSetTaskList/data.go | 9 +- .../getPowerDeviceSetTaskList/struct.go | 17 +- .../getPowerFormulaFaultAnalyse/data.go | 8 +- .../getPowerFormulaFaultAnalyse/struct.go | 17 +- .../AppService/getPowerPictureList/data.go | 5 +- .../AppService/getPowerPictureList/struct.go | 17 +- .../getPowerRobotInfoByRobotSn/data.go | 8 +- .../getPowerRobotInfoByRobotSn/struct.go | 17 +- .../getPowerRobotSweepAttrByPsId/data.go | 8 +- .../getPowerRobotSweepAttrByPsId/struct.go | 17 +- .../getPowerRobotSweepStrategy/data.go | 6 +- .../getPowerRobotSweepStrategy/struct.go | 17 +- .../getPowerRobotSweepStrategyList/data.go | 8 +- .../getPowerRobotSweepStrategyList/struct.go | 17 +- .../AppService/getPowerSettingCharges/data.go | 12 +- .../getPowerSettingCharges/struct.go | 20 +- .../getPowerSettingHistoryRecords/data.go | 6 +- .../getPowerSettingHistoryRecords/struct.go | 17 +- .../getPowerStationBasicInfo/data.go | 7 +- .../getPowerStationBasicInfo/struct.go | 17 +- .../AppService/getPowerStationData/data.go | 79 +- .../AppService/getPowerStationData/struct.go | 17 +- .../getPowerStationForHousehold/data.go | 9 +- .../getPowerStationForHousehold/struct.go | 17 +- .../AppService/getPowerStationInfo/data.go | 9 +- .../AppService/getPowerStationInfo/struct.go | 17 +- .../AppService/getPowerStationPR/data.go | 8 +- .../AppService/getPowerStationPR/struct.go | 17 +- .../getPowerStationTableDataSql/data.go | 8 +- .../getPowerStationTableDataSql/struct.go | 17 +- .../getPowerStationTableDataSqlCount/data.go | 8 +- .../struct.go | 17 +- .../AppService/getPowerStatistics/data.go | 19 +- .../AppService/getPowerStatistics/struct.go | 20 +- .../AppService/getPowerTrendDayData/data.go | 8 +- .../AppService/getPowerTrendDayData/struct.go | 17 +- .../getPrivateCloudValidityPeriod/data.go | 8 +- .../getPrivateCloudValidityPeriod/struct.go | 17 +- .../getProvInfoListByNationCode/data.go | 8 +- .../getProvInfoListByNationCode/struct.go | 17 +- iSolarCloud/AppService/getPsAuthKey/data.go | 8 +- iSolarCloud/AppService/getPsAuthKey/struct.go | 17 +- iSolarCloud/AppService/getPsCurveInfo/data.go | 8 +- .../AppService/getPsCurveInfo/struct.go | 17 +- .../getPsDataSupplementTaskList/data.go | 7 +- .../getPsDataSupplementTaskList/struct.go | 17 +- iSolarCloud/AppService/getPsDetail/data.go | 213 +-- iSolarCloud/AppService/getPsDetail/struct.go | 17 +- .../getPsDetailByUserTokens/data.go | 5 +- .../getPsDetailByUserTokens/struct.go | 17 +- .../getPsDetailForSinglePage/data.go | 8 +- .../getPsDetailForSinglePage/struct.go | 17 +- .../AppService/getPsDetailWithPsType/data.go | 91 +- .../getPsDetailWithPsType/struct.go | 17 +- .../AppService/getPsHealthState/data.go | 7 +- .../AppService/getPsHealthState/struct.go | 17 +- .../AppService/getPsInstallerByPsId/data.go | 11 +- .../AppService/getPsInstallerByPsId/struct.go | 17 +- .../getPsInstallerOrgInfoByPsId/data.go | 10 +- .../getPsInstallerOrgInfoByPsId/struct.go | 17 +- iSolarCloud/AppService/getPsList/data.go | 9 +- iSolarCloud/AppService/getPsList/funcs.go | 3 +- iSolarCloud/AppService/getPsList/struct.go | 17 +- .../AppService/getPsListByName/data.go | 7 +- .../AppService/getPsListByName/struct.go | 17 +- .../getPsListForPsDataByPsId/data.go | 8 +- .../getPsListForPsDataByPsId/struct.go | 17 +- .../AppService/getPsListStaticData/data.go | 19 +- .../AppService/getPsListStaticData/struct.go | 17 +- iSolarCloud/AppService/getPsReport/data.go | 42 +- iSolarCloud/AppService/getPsReport/struct.go | 17 +- iSolarCloud/AppService/getPsUser/data.go | 9 +- iSolarCloud/AppService/getPsUser/struct.go | 17 +- .../AppService/getPsWeatherList/data.go | 43 +- .../AppService/getPsWeatherList/struct.go | 17 +- .../AppService/getRechargeOrderDetail/data.go | 8 +- .../getRechargeOrderDetail/struct.go | 17 +- .../getRechargeOrderItemDeviceList/data.go | 8 +- .../getRechargeOrderItemDeviceList/struct.go | 17 +- .../AppService/getRechargeOrderList/data.go | 8 +- .../AppService/getRechargeOrderList/struct.go | 17 +- .../AppService/getRegionalTree/data.go | 10 +- .../AppService/getRegionalTree/struct.go | 17 +- .../getRemoteParamSettingList/data.go | 139 +- .../getRemoteParamSettingList/struct.go | 17 +- .../getRemoteUpgradeDeviceList/data.go | 9 +- .../getRemoteUpgradeDeviceList/struct.go | 17 +- .../getRemoteUpgradeScheduleDetails/data.go | 8 +- .../getRemoteUpgradeScheduleDetails/struct.go | 17 +- .../getRemoteUpgradeSubTasksList/data.go | 13 +- .../getRemoteUpgradeSubTasksList/struct.go | 17 +- .../getRemoteUpgradeTaskList/data.go | 7 +- .../getRemoteUpgradeTaskList/struct.go | 17 +- iSolarCloud/AppService/getReportData/data.go | 8 +- .../AppService/getReportData/struct.go | 17 +- .../getReportEmailConfigInfo/data.go | 10 +- .../getReportEmailConfigInfo/struct.go | 17 +- .../AppService/getReportExportColumns/data.go | 8 +- .../getReportExportColumns/struct.go | 17 +- .../AppService/getReportListByUserId/data.go | 8 +- .../getReportListByUserId/struct.go | 17 +- .../getRobotDynamicCleaningView/data.go | 10 +- .../getRobotDynamicCleaningView/struct.go | 17 +- .../getRobotNumAndSweepCapacity/data.go | 8 +- .../getRobotNumAndSweepCapacity/struct.go | 17 +- iSolarCloud/AppService/getRuleUnit/data.go | 8 +- iSolarCloud/AppService/getRuleUnit/struct.go | 17 +- .../getSendReportConfigCron/data.go | 8 +- .../getSendReportConfigCron/struct.go | 17 +- iSolarCloud/AppService/getSerialNum/data.go | 8 +- iSolarCloud/AppService/getSerialNum/struct.go | 17 +- .../getShieldMapConditionList/data.go | 8 +- .../getShieldMapConditionList/struct.go | 17 +- .../AppService/getSimIdBySnList/data.go | 8 +- .../AppService/getSimIdBySnList/struct.go | 17 +- .../AppService/getSingleIVData/data.go | 8 +- .../AppService/getSingleIVData/struct.go | 17 +- .../AppService/getSnChangeRecord/data.go | 8 +- .../AppService/getSnChangeRecord/struct.go | 17 +- .../AppService/getSnConnectionInfo/data.go | 9 +- .../AppService/getSnConnectionInfo/struct.go | 17 +- .../AppService/getStationInfoSql/data.go | 8 +- .../AppService/getStationInfoSql/struct.go | 17 +- .../AppService/getSungwsConfigCache/data.go | 8 +- .../AppService/getSungwsConfigCache/struct.go | 17 +- .../getSungwsGlobalConfigCache/data.go | 164 ++- .../getSungwsGlobalConfigCache/struct.go | 17 +- .../getSweepDevParamSetTemplate/data.go | 8 +- .../getSweepDevParamSetTemplate/struct.go | 17 +- .../AppService/getSweepRobotDevList/data.go | 8 +- .../AppService/getSweepRobotDevList/struct.go | 17 +- iSolarCloud/AppService/getSysMsg/data.go | 86 +- iSolarCloud/AppService/getSysMsg/struct.go | 17 +- .../AppService/getSysOrgNewList/data.go | 8 +- .../AppService/getSysOrgNewList/struct.go | 17 +- .../AppService/getSysOrgNewOne/data.go | 8 +- .../AppService/getSysOrgNewOne/struct.go | 17 +- iSolarCloud/AppService/getSysUserById/data.go | 8 +- .../AppService/getSysUserById/struct.go | 17 +- .../AppService/getTableDataSql/data.go | 8 +- .../AppService/getTableDataSql/struct.go | 17 +- .../AppService/getTableDataSqlCount/data.go | 8 +- .../AppService/getTableDataSqlCount/struct.go | 17 +- .../AppService/getTemplateByInfoType/data.go | 8 +- .../getTemplateByInfoType/struct.go | 17 +- .../AppService/getTemplateList/data.go | 11 +- .../AppService/getTemplateList/struct.go | 17 +- .../AppService/getUUIDByUpuuid/data.go | 8 +- .../AppService/getUUIDByUpuuid/struct.go | 17 +- iSolarCloud/AppService/getUpTimePoint/data.go | 11 +- .../AppService/getUpTimePoint/struct.go | 17 +- iSolarCloud/AppService/getUserById/data.go | 8 +- iSolarCloud/AppService/getUserById/struct.go | 17 +- .../AppService/getUserByInstaller/data.go | 8 +- .../AppService/getUserByInstaller/struct.go | 17 +- .../getUserDevOnlineOffineCount/data.go | 8 +- .../getUserDevOnlineOffineCount/struct.go | 17 +- .../AppService/getUserGDPRAttrs/data.go | 8 +- .../AppService/getUserGDPRAttrs/struct.go | 17 +- .../getUserHavePowerStationCount/data.go | 8 +- .../getUserHavePowerStationCount/struct.go | 17 +- .../getUserInfoByUserAccounts/data.go | 8 +- .../getUserInfoByUserAccounts/struct.go | 17 +- iSolarCloud/AppService/getUserList/data.go | 17 +- iSolarCloud/AppService/getUserList/struct.go | 17 +- .../AppService/getUserPsOrderList/data.go | 23 +- .../AppService/getUserPsOrderList/struct.go | 17 +- .../AppService/getValFromHBase/data.go | 8 +- .../AppService/getValFromHBase/struct.go | 17 +- .../AppService/getValidateCode/data.go | 8 +- .../AppService/getValidateCode/struct.go | 17 +- .../getValidateCodeAtRegister/data.go | 8 +- .../getValidateCodeAtRegister/struct.go | 17 +- iSolarCloud/AppService/getWeatherInfo/data.go | 8 +- .../AppService/getWeatherInfo/struct.go | 17 +- .../AppService/getWechatPushConfig/data.go | 8 +- .../AppService/getWechatPushConfig/struct.go | 17 +- iSolarCloud/AppService/getWorkInfo/data.go | 8 +- iSolarCloud/AppService/getWorkInfo/struct.go | 17 +- .../AppService/groupStringCheck/data.go | 8 +- .../AppService/groupStringCheck/struct.go | 17 +- .../handleDevByCommunicationSN/data.go | 8 +- .../handleDevByCommunicationSN/struct.go | 17 +- .../AppService/householdResetPassBySN/data.go | 8 +- .../householdResetPassBySN/struct.go | 17 +- .../AppService/immediatePayment/data.go | 8 +- .../AppService/immediatePayment/struct.go | 17 +- .../AppService/importExcelData/data.go | 8 +- .../AppService/importExcelData/struct.go | 17 +- .../AppService/incomeStatistics/data.go | 8 +- .../AppService/incomeStatistics/struct.go | 17 +- iSolarCloud/AppService/informPush/data.go | 8 +- iSolarCloud/AppService/informPush/struct.go | 17 +- .../AppService/insertEmgOrgInfo/data.go | 8 +- .../AppService/insertEmgOrgInfo/struct.go | 17 +- .../insightSynDeviceStructure2Cloud/data.go | 8 +- .../insightSynDeviceStructure2Cloud/struct.go | 17 +- .../AppService/intoDataToHbase/data.go | 8 +- .../AppService/intoDataToHbase/struct.go | 17 +- .../AppService/ipLocationQuery/data.go | 8 +- .../AppService/ipLocationQuery/struct.go | 17 +- iSolarCloud/AppService/isHave2GSn/data.go | 8 +- iSolarCloud/AppService/isHave2GSn/struct.go | 17 +- .../judgeDevIsHasInitSetTemplate/data.go | 8 +- .../judgeDevIsHasInitSetTemplate/struct.go | 17 +- .../AppService/judgeIsSettingMan/data.go | 8 +- .../AppService/judgeIsSettingMan/struct.go | 17 +- iSolarCloud/AppService/listOssFiles/data.go | 8 +- iSolarCloud/AppService/listOssFiles/struct.go | 17 +- iSolarCloud/AppService/loadAreaInfo/data.go | 8 +- iSolarCloud/AppService/loadAreaInfo/struct.go | 17 +- .../AppService/loadPowerStation/data.go | 8 +- .../AppService/loadPowerStation/struct.go | 17 +- iSolarCloud/AppService/login/auth.go | 23 +- iSolarCloud/AppService/login/data.go | 192 +-- iSolarCloud/AppService/login/struct.go | 31 +- iSolarCloud/AppService/loginByToken/data.go | 8 +- iSolarCloud/AppService/loginByToken/struct.go | 17 +- iSolarCloud/AppService/logout/data.go | 8 +- iSolarCloud/AppService/logout/struct.go | 17 +- .../AppService/mobilePhoneHasBound/data.go | 8 +- .../AppService/mobilePhoneHasBound/struct.go | 17 +- .../AppService/modifiedDeviceInfo/data.go | 8 +- .../AppService/modifiedDeviceInfo/struct.go | 17 +- .../AppService/modifyEmgOrgStruc/data.go | 8 +- .../AppService/modifyEmgOrgStruc/struct.go | 17 +- .../AppService/modifyFaultPlan/data.go | 8 +- .../AppService/modifyFaultPlan/struct.go | 17 +- .../AppService/modifyOnDutyInfo/data.go | 8 +- .../AppService/modifyOnDutyInfo/struct.go | 17 +- iSolarCloud/AppService/modifyPassword/data.go | 8 +- .../AppService/modifyPassword/struct.go | 17 +- .../AppService/modifyPersonalUnitList/data.go | 8 +- .../modifyPersonalUnitList/struct.go | 17 +- iSolarCloud/AppService/modifyPsUser/data.go | 8 +- iSolarCloud/AppService/modifyPsUser/struct.go | 17 +- .../AppService/moduleLogParamSet/data.go | 8 +- .../AppService/moduleLogParamSet/struct.go | 17 +- iSolarCloud/AppService/operateOssFile/data.go | 8 +- .../AppService/operateOssFile/struct.go | 17 +- .../operationPowerRobotSweepStrategy/data.go | 8 +- .../struct.go | 17 +- iSolarCloud/AppService/orgPowerReport/data.go | 8 +- .../AppService/orgPowerReport/struct.go | 17 +- .../AppService/paramSetTryAgain/data.go | 8 +- .../AppService/paramSetTryAgain/struct.go | 17 +- iSolarCloud/AppService/paramSetting/data.go | 8 +- iSolarCloud/AppService/paramSetting/struct.go | 17 +- iSolarCloud/AppService/planPower/data.go | 8 +- iSolarCloud/AppService/planPower/struct.go | 17 +- .../AppService/powerDevicePointList/data.go | 7 +- .../AppService/powerDevicePointList/struct.go | 17 +- .../AppService/powerTrendChartData/data.go | 8 +- .../AppService/powerTrendChartData/struct.go | 17 +- iSolarCloud/AppService/psForcastInfo/data.go | 63 +- .../AppService/psForcastInfo/struct.go | 17 +- .../AppService/psHourPointsValue/data.go | 9 +- .../AppService/psHourPointsValue/struct.go | 17 +- .../AppService/queryAllPsIdAndName/data.go | 11 +- .../AppService/queryAllPsIdAndName/struct.go | 17 +- .../queryBatchCreatePsTaskList/data.go | 5 +- .../queryBatchCreatePsTaskList/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../AppService/queryCardStatusCTCC/data.go | 8 +- .../AppService/queryCardStatusCTCC/struct.go | 17 +- .../AppService/queryChildAccountList/data.go | 8 +- .../queryChildAccountList/struct.go | 17 +- .../queryCompensationRecordData/data.go | 8 +- .../queryCompensationRecordData/struct.go | 17 +- .../queryCompensationRecordList/data.go | 8 +- .../queryCompensationRecordList/struct.go | 17 +- iSolarCloud/AppService/queryComponent/data.go | 8 +- .../AppService/queryComponent/struct.go | 17 +- .../queryComponentTechnicalParam/data.go | 8 +- .../queryComponentTechnicalParam/struct.go | 17 +- .../queryCountryGridAndRelation/data.go | 8 +- .../queryCountryGridAndRelation/struct.go | 17 +- .../AppService/queryCountryList/data.go | 8 +- .../AppService/queryCountryList/struct.go | 17 +- .../AppService/queryCtrlTaskById/data.go | 7 +- .../AppService/queryCtrlTaskById/struct.go | 17 +- .../AppService/queryDeviceInfo/data.go | 19 +- .../AppService/queryDeviceInfo/struct.go | 17 +- .../AppService/queryDeviceInfoForApp/data.go | 21 +- .../queryDeviceInfoForApp/struct.go | 17 +- .../AppService/queryDeviceList/data.go | 57 +- .../AppService/queryDeviceList/struct.go | 17 +- .../queryDeviceListByUserId/data.go | 13 +- .../queryDeviceListByUserId/struct.go | 17 +- .../AppService/queryDeviceListForApp/data.go | 97 +- .../queryDeviceListForApp/struct.go | 17 +- .../queryDeviceModelTechnical/data.go | 8 +- .../queryDeviceModelTechnical/struct.go | 17 +- .../data.go | 20 +- .../struct.go | 17 +- .../queryDevicePointMinuteDataList/data.go | 17 +- .../queryDevicePointMinuteDataList/struct.go | 17 +- .../data.go | 23 +- .../struct.go | 17 +- .../queryDeviceRealTimeDataByPsKeys/data.go | 9 +- .../queryDeviceRealTimeDataByPsKeys/struct.go | 17 +- .../AppService/queryDeviceRepairList/data.go | 8 +- .../queryDeviceRepairList/struct.go | 17 +- .../queryDeviceTypeInfoList/data.go | 8 +- .../queryDeviceTypeInfoList/struct.go | 17 +- .../AppService/queryEnvironmentList/data.go | 8 +- .../AppService/queryEnvironmentList/struct.go | 17 +- iSolarCloud/AppService/queryFaultList/data.go | 8 +- .../AppService/queryFaultList/struct.go | 17 +- .../AppService/queryFaultPlanDetail/data.go | 8 +- .../AppService/queryFaultPlanDetail/struct.go | 17 +- .../AppService/queryFaultRepairSteps/data.go | 8 +- .../queryFaultRepairSteps/struct.go | 17 +- .../queryFaultTypeAndLevelByCode/data.go | 8 +- .../queryFaultTypeAndLevelByCode/struct.go | 17 +- .../AppService/queryFaultTypeByDevice/data.go | 9 +- .../queryFaultTypeByDevice/struct.go | 17 +- .../queryFaultTypeByDevicePage/data.go | 9 +- .../queryFaultTypeByDevicePage/struct.go | 17 +- .../AppService/queryFirmwareFilesPage/data.go | 7 +- .../queryFirmwareFilesPage/struct.go | 17 +- .../AppService/queryInfotoAlert/data.go | 8 +- .../AppService/queryInfotoAlert/struct.go | 17 +- .../AppService/queryInverterModelList/data.go | 10 +- .../queryInverterModelList/struct.go | 17 +- .../queryInverterVersionList/data.go | 8 +- .../queryInverterVersionList/struct.go | 17 +- .../AppService/queryM2MCardInfoCMCC/data.go | 8 +- .../AppService/queryM2MCardInfoCMCC/struct.go | 17 +- .../queryM2MCardTermInfoCMCC/data.go | 8 +- .../queryM2MCardTermInfoCMCC/struct.go | 17 +- .../queryModelInfoByModelId/data.go | 8 +- .../queryModelInfoByModelId/struct.go | 17 +- .../AppService/queryMutiPointDataList/data.go | 29 +- .../queryMutiPointDataList/struct.go | 17 +- .../AppService/queryNoticeList/data.go | 8 +- .../AppService/queryNoticeList/struct.go | 17 +- .../queryNumberOfRenewalReminders/data.go | 8 +- .../queryNumberOfRenewalReminders/struct.go | 17 +- iSolarCloud/AppService/queryOperRules/data.go | 8 +- .../AppService/queryOperRules/struct.go | 17 +- iSolarCloud/AppService/queryOrderList/data.go | 8 +- .../AppService/queryOrderList/struct.go | 17 +- iSolarCloud/AppService/queryOrderStep/data.go | 8 +- .../AppService/queryOrderStep/struct.go | 17 +- .../queryOrgGenerationReport/data.go | 8 +- .../queryOrgGenerationReport/struct.go | 17 +- .../AppService/queryOrgInfoList/data.go | 8 +- .../AppService/queryOrgInfoList/struct.go | 17 +- .../queryOrgPowerElecPercent/data.go | 8 +- .../queryOrgPowerElecPercent/struct.go | 17 +- .../queryOrgPsCompensationRecordList/data.go | 8 +- .../struct.go | 17 +- .../AppService/queryParamSettingTask/data.go | 37 +- .../queryParamSettingTask/struct.go | 17 +- .../AppService/queryPersonalUnitList/data.go | 8 +- .../queryPersonalUnitList/struct.go | 17 +- .../AppService/queryPointDataTopOne/data.go | 8 +- .../AppService/queryPointDataTopOne/struct.go | 17 +- .../AppService/queryPowerStationInfo/data.go | 13 +- .../queryPowerStationInfo/struct.go | 17 +- .../queryPsAreaByUserIdAndAreaCode/data.go | 8 +- .../queryPsAreaByUserIdAndAreaCode/struct.go | 17 +- .../queryPsCompensationRecordList/data.go | 8 +- .../queryPsCompensationRecordList/struct.go | 17 +- .../AppService/queryPsDataByDate/data.go | 8 +- .../AppService/queryPsDataByDate/struct.go | 17 +- iSolarCloud/AppService/queryPsIdList/data.go | 10 +- .../AppService/queryPsIdList/struct.go | 17 +- .../queryPsListByUserIdAndAreaCode/data.go | 8 +- .../queryPsListByUserIdAndAreaCode/struct.go | 17 +- .../AppService/queryPsNameByPsId/data.go | 10 +- .../AppService/queryPsNameByPsId/struct.go | 17 +- .../AppService/queryPsPrByDate/data.go | 8 +- .../AppService/queryPsPrByDate/struct.go | 17 +- iSolarCloud/AppService/queryPsProfit/data.go | 57 +- .../AppService/queryPsProfit/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../AppService/queryPsStructureList/data.go | 14 +- .../AppService/queryPsStructureList/struct.go | 17 +- .../queryPuuidsByCommandTotalId/data.go | 8 +- .../queryPuuidsByCommandTotalId/struct.go | 17 +- .../queryPuuidsByCommandTotalId2/data.go | 8 +- .../queryPuuidsByCommandTotalId2/struct.go | 17 +- .../AppService/queryRepairRuleList/data.go | 8 +- .../AppService/queryRepairRuleList/struct.go | 17 +- .../queryReportListForManagementPage/data.go | 8 +- .../struct.go | 17 +- iSolarCloud/AppService/queryReportMsg/data.go | 8 +- .../AppService/queryReportMsg/struct.go | 17 +- iSolarCloud/AppService/querySharingPs/data.go | 8 +- .../AppService/querySharingPs/struct.go | 17 +- .../AppService/querySysAdvancedParam/data.go | 7 +- .../querySysAdvancedParam/struct.go | 17 +- iSolarCloud/AppService/queryTimeBySN/data.go | 8 +- .../AppService/queryTimeBySN/struct.go | 17 +- .../AppService/queryTrafficByDateCTCC/data.go | 8 +- .../queryTrafficByDateCTCC/struct.go | 17 +- .../AppService/queryTrafficCTCC/data.go | 8 +- .../AppService/queryTrafficCTCC/struct.go | 17 +- iSolarCloud/AppService/queryUnitList/data.go | 9 +- .../AppService/queryUnitList/struct.go | 17 +- .../AppService/queryUnitUuidBytotalId/data.go | 8 +- .../queryUnitUuidBytotalId/struct.go | 17 +- .../AppService/queryUserBtnPri/data.go | 8 +- .../AppService/queryUserBtnPri/struct.go | 17 +- .../AppService/queryUserByUserIds/data.go | 8 +- .../AppService/queryUserByUserIds/struct.go | 17 +- .../queryUserExtensionAttribute/data.go | 8 +- .../queryUserExtensionAttribute/struct.go | 17 +- .../AppService/queryUserForStep/data.go | 8 +- .../AppService/queryUserForStep/struct.go | 17 +- iSolarCloud/AppService/queryUserList/data.go | 13 +- .../AppService/queryUserList/struct.go | 17 +- .../AppService/queryUserProcessPri/data.go | 8 +- .../AppService/queryUserProcessPri/struct.go | 17 +- .../AppService/queryUserWechatBindRel/data.go | 8 +- .../queryUserWechatBindRel/struct.go | 17 +- .../queryUuidByTotalIdAndUuid/data.go | 8 +- .../queryUuidByTotalIdAndUuid/struct.go | 17 +- .../AppService/rechargeOrderSetMeal/data.go | 8 +- .../AppService/rechargeOrderSetMeal/struct.go | 17 +- .../renewSendReportConfirmEmail/data.go | 8 +- .../renewSendReportConfirmEmail/struct.go | 17 +- iSolarCloud/AppService/reportList/data.go | 12 +- iSolarCloud/AppService/reportList/struct.go | 17 +- .../AppService/saveCustomerEmployee/data.go | 8 +- .../AppService/saveCustomerEmployee/struct.go | 17 +- iSolarCloud/AppService/saveDevSimList/data.go | 8 +- .../AppService/saveDevSimList/struct.go | 17 +- .../saveDeviceAccountBatchData/data.go | 8 +- .../saveDeviceAccountBatchData/struct.go | 17 +- .../saveEnviromentIncomeInfos/data.go | 8 +- .../saveEnviromentIncomeInfos/struct.go | 17 +- .../AppService/saveEnvironmentCurve/data.go | 8 +- .../AppService/saveEnvironmentCurve/struct.go | 17 +- .../AppService/saveFirmwareFile/data.go | 8 +- .../AppService/saveFirmwareFile/struct.go | 17 +- .../AppService/saveIncomeSettingInfos/data.go | 8 +- .../saveIncomeSettingInfos/struct.go | 17 +- .../saveOrUpdateGroupStringCheckRule/data.go | 8 +- .../struct.go | 17 +- iSolarCloud/AppService/saveParamModel/data.go | 8 +- .../AppService/saveParamModel/struct.go | 17 +- .../AppService/savePowerCharges/data.go | 8 +- .../AppService/savePowerCharges/struct.go | 17 +- .../AppService/savePowerDevicePoint/data.go | 8 +- .../AppService/savePowerDevicePoint/struct.go | 17 +- .../AppService/savePowerRobotInfo/data.go | 8 +- .../AppService/savePowerRobotInfo/struct.go | 17 +- .../savePowerRobotSweepAttr/data.go | 8 +- .../savePowerRobotSweepAttr/struct.go | 17 +- .../savePowerSettingCharges/data.go | 8 +- .../savePowerSettingCharges/struct.go | 17 +- .../AppService/savePowerSettingInfo/data.go | 8 +- .../AppService/savePowerSettingInfo/struct.go | 17 +- .../saveProductionBatchData/data.go | 8 +- .../saveProductionBatchData/struct.go | 17 +- .../AppService/saveRechargeOrderObj/data.go | 8 +- .../AppService/saveRechargeOrderObj/struct.go | 17 +- .../saveRechargeOrderOtherInfo/data.go | 8 +- .../saveRechargeOrderOtherInfo/struct.go | 17 +- iSolarCloud/AppService/saveRepair/data.go | 8 +- iSolarCloud/AppService/saveRepair/struct.go | 17 +- .../saveReportExportColumns/data.go | 8 +- .../saveReportExportColumns/struct.go | 17 +- iSolarCloud/AppService/saveSetParam/data.go | 8 +- iSolarCloud/AppService/saveSetParam/struct.go | 17 +- iSolarCloud/AppService/saveSysUserMsg/data.go | 8 +- .../AppService/saveSysUserMsg/struct.go | 17 +- iSolarCloud/AppService/saveTemplate/data.go | 8 +- iSolarCloud/AppService/saveTemplate/struct.go | 17 +- .../AppService/searchM2MMonthFlowCMCC/data.go | 8 +- .../searchM2MMonthFlowCMCC/struct.go | 17 +- .../selectSysTranslationNames/data.go | 8 +- .../selectSysTranslationNames/struct.go | 17 +- .../sendPsTimeZoneInstruction/data.go | 8 +- .../sendPsTimeZoneInstruction/struct.go | 17 +- .../setUpFormulaFaultAnalyse/data.go | 8 +- .../setUpFormulaFaultAnalyse/struct.go | 17 +- .../AppService/setUserGDPRAttrs/data.go | 8 +- .../AppService/setUserGDPRAttrs/struct.go | 17 +- iSolarCloud/AppService/settingNotice/data.go | 8 +- .../AppService/settingNotice/struct.go | 17 +- iSolarCloud/AppService/shareMyPs/data.go | 8 +- iSolarCloud/AppService/shareMyPs/struct.go | 17 +- iSolarCloud/AppService/sharePsBySN/data.go | 8 +- iSolarCloud/AppService/sharePsBySN/struct.go | 17 +- .../AppService/showInverterByUnit/data.go | 7 +- .../AppService/showInverterByUnit/struct.go | 17 +- .../AppService/showOnlineUsers/data.go | 8 +- .../AppService/showOnlineUsers/struct.go | 17 +- iSolarCloud/AppService/showWarning/data.go | 8 +- iSolarCloud/AppService/showWarning/struct.go | 17 +- iSolarCloud/AppService/snIsExist/data.go | 8 +- iSolarCloud/AppService/snIsExist/struct.go | 17 +- iSolarCloud/AppService/snsIsExist/data.go | 8 +- iSolarCloud/AppService/snsIsExist/struct.go | 17 +- .../AppService/speedyAddPowerStation/data.go | 8 +- .../speedyAddPowerStation/struct.go | 17 +- .../stationDeviceHistoryDataList/data.go | 8 +- .../stationDeviceHistoryDataList/struct.go | 17 +- .../AppService/stationUnitsList/data.go | 8 +- .../AppService/stationUnitsList/struct.go | 17 +- .../AppService/stationsDiscreteData/data.go | 8 +- .../AppService/stationsDiscreteData/struct.go | 17 +- .../AppService/stationsIncomeList/data.go | 8 +- .../AppService/stationsIncomeList/struct.go | 17 +- .../AppService/stationsPointReport/data.go | 13 +- .../AppService/stationsPointReport/struct.go | 17 +- .../AppService/stationsYearPlanReport/data.go | 8 +- .../stationsYearPlanReport/struct.go | 17 +- iSolarCloud/AppService/struct.go | 1153 ++++++++-------- .../sureAndImportSelettlementData/data.go | 8 +- .../sureAndImportSelettlementData/struct.go | 17 +- .../AppService/sweepDevParamSet/data.go | 8 +- .../AppService/sweepDevParamSet/struct.go | 17 +- .../AppService/sweepDevRunControl/data.go | 8 +- .../AppService/sweepDevRunControl/struct.go | 17 +- .../AppService/sweepDevStrategyIssue/data.go | 8 +- .../sweepDevStrategyIssue/struct.go | 17 +- .../AppService/sysTimeZoneList/data.go | 8 +- .../AppService/sysTimeZoneList/struct.go | 17 +- iSolarCloud/AppService/unLockUser/data.go | 8 +- iSolarCloud/AppService/unLockUser/struct.go | 17 +- .../AppService/unlockChildAccount/data.go | 8 +- .../AppService/unlockChildAccount/struct.go | 17 +- .../updateCommunicationModuleState/data.go | 8 +- .../updateCommunicationModuleState/struct.go | 17 +- .../updateDevInstalledPower/data.go | 8 +- .../updateDevInstalledPower/struct.go | 17 +- iSolarCloud/AppService/updateFault/data.go | 8 +- iSolarCloud/AppService/updateFault/struct.go | 17 +- .../AppService/updateFaultData/data.go | 8 +- .../AppService/updateFaultData/struct.go | 17 +- .../updateFaultMsgByFaultCode/data.go | 8 +- .../updateFaultMsgByFaultCode/struct.go | 17 +- .../AppService/updateFaultStatus/data.go | 8 +- .../AppService/updateFaultStatus/struct.go | 17 +- .../updateHouseholdWorkOrder/data.go | 8 +- .../updateHouseholdWorkOrder/struct.go | 17 +- .../updateInverterSn2ModuleSn/data.go | 8 +- .../updateInverterSn2ModuleSn/struct.go | 17 +- .../updateOperateTicketAttachmentId/data.go | 8 +- .../updateOperateTicketAttachmentId/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../AppService/updateOwnerFaultConfig/data.go | 8 +- .../updateOwnerFaultConfig/struct.go | 17 +- .../updateParamSettingSysMsg/data.go | 8 +- .../updateParamSettingSysMsg/struct.go | 17 +- .../updatePlatformLevelFaultLevel/data.go | 8 +- .../updatePlatformLevelFaultLevel/struct.go | 17 +- .../AppService/updatePowerDevicePoint/data.go | 8 +- .../updatePowerDevicePoint/struct.go | 17 +- .../AppService/updatePowerRobotInfo/data.go | 8 +- .../AppService/updatePowerRobotInfo/struct.go | 17 +- .../updatePowerRobotSweepAttr/data.go | 8 +- .../updatePowerRobotSweepAttr/struct.go | 17 +- .../updatePowerStationForHousehold/data.go | 8 +- .../updatePowerStationForHousehold/struct.go | 17 +- .../AppService/updatePowerStationInfo/data.go | 8 +- .../updatePowerStationInfo/struct.go | 17 +- .../AppService/updatePowerUserInfo/data.go | 8 +- .../AppService/updatePowerUserInfo/struct.go | 17 +- .../updateReportConfigByEmailAddr/data.go | 8 +- .../updateReportConfigByEmailAddr/struct.go | 17 +- .../AppService/updateShareAttr/data.go | 8 +- .../AppService/updateShareAttr/struct.go | 17 +- .../AppService/updateSnIsSureFlag/data.go | 8 +- .../AppService/updateSnIsSureFlag/struct.go | 17 +- .../AppService/updateStationPics/data.go | 8 +- .../AppService/updateStationPics/struct.go | 17 +- .../AppService/updateSysAdvancedParam/data.go | 8 +- .../updateSysAdvancedParam/struct.go | 17 +- .../AppService/updateSysOrgNew/data.go | 8 +- .../AppService/updateSysOrgNew/struct.go | 17 +- iSolarCloud/AppService/updateTemplate/data.go | 8 +- .../AppService/updateTemplate/struct.go | 17 +- .../AppService/updateUinfoNetEaseUser/data.go | 8 +- .../updateUinfoNetEaseUser/struct.go | 17 +- .../updateUserExtensionAttribute/data.go | 8 +- .../updateUserExtensionAttribute/struct.go | 17 +- .../AppService/updateUserLanguage/data.go | 8 +- .../AppService/updateUserLanguage/struct.go | 17 +- .../AppService/updateUserPosition/data.go | 8 +- .../AppService/updateUserPosition/struct.go | 17 +- .../AppService/updateUserUpOrg/data.go | 8 +- .../AppService/updateUserUpOrg/struct.go | 17 +- iSolarCloud/AppService/upgrade/data.go | 8 +- iSolarCloud/AppService/upgrade/struct.go | 17 +- iSolarCloud/AppService/upgrate/data.go | 8 +- iSolarCloud/AppService/upgrate/struct.go | 17 +- .../AppService/uploadFileToOss/data.go | 8 +- .../AppService/uploadFileToOss/struct.go | 17 +- .../AppService/userAgreeGdprProtocol/data.go | 8 +- .../userAgreeGdprProtocol/struct.go | 17 +- .../AppService/userInfoUniqueCheck/data.go | 8 +- .../AppService/userInfoUniqueCheck/struct.go | 17 +- .../AppService/userMailHasBound/data.go | 8 +- .../AppService/userMailHasBound/struct.go | 17 +- iSolarCloud/AppService/userRegister/data.go | 8 +- iSolarCloud/AppService/userRegister/struct.go | 17 +- iSolarCloud/Common/images.go | 58 +- .../accumEnergyPsKpiData/data.go | 8 +- .../accumEnergyPsKpiData/struct.go | 17 +- .../addBuildProgressing/data.go | 8 +- .../addBuildProgressing/struct.go | 17 +- .../deleteBuildProgressing/data.go | 8 +- .../deleteBuildProgressing/struct.go | 17 +- .../energyEquivalentHoursRanking/data.go | 8 +- .../energyEquivalentHoursRanking/struct.go | 17 +- .../energyGetRankBySortName/data.go | 8 +- .../energyGetRankBySortName/struct.go | 17 +- .../energyPovertyAlleviation/data.go | 8 +- .../energyPovertyAlleviation/struct.go | 17 +- .../energyPowerGenerationTrends/data.go | 8 +- .../energyPowerGenerationTrends/struct.go | 17 +- .../findSingleStationPR/data.go | 8 +- .../findSingleStationPR/struct.go | 17 +- .../getCapabilityTrend/data.go | 8 +- .../getCapabilityTrend/struct.go | 17 +- .../getKpiByUserIdAndAreaCode/data.go | 8 +- .../getKpiByUserIdAndAreaCode/struct.go | 17 +- .../MttvScreenService/getMapByUser/data.go | 8 +- .../MttvScreenService/getMapByUser/struct.go | 17 +- .../getOrgProByUserId/data.go | 8 +- .../getOrgProByUserId/struct.go | 17 +- .../getPlanAndActualPower/data.go | 8 +- .../getPlanAndActualPower/struct.go | 17 +- .../getPsDeviceListValue/data.go | 21 +- .../getPsDeviceListValue/struct.go | 17 +- .../getPsInfoWithJoinGridByPsId/data.go | 8 +- .../getPsInfoWithJoinGridByPsId/struct.go | 17 +- .../getPsKpiForHoursByPsId/data.go | 9 +- .../getPsKpiForHoursByPsId/struct.go | 17 +- .../getPsListByMapId/data.go | 5 +- .../getPsListByMapId/struct.go | 17 +- .../getPsListByUserIdAndAreaCode/data.go | 8 +- .../getPsListByUserIdAndAreaCode/struct.go | 17 +- .../getTheoryAndActualPower/data.go | 10 +- .../getTheoryAndActualPower/struct.go | 17 +- .../nextLevelOrgList/data.go | 8 +- .../nextLevelOrgList/struct.go | 17 +- .../nextLevelOrgStatisticalDataList/data.go | 8 +- .../nextLevelOrgStatisticalDataList/struct.go | 17 +- .../MttvScreenService/orgPowerReport/data.go | 12 +- .../orgPowerReport/struct.go | 17 +- .../queryBuildProgressing/data.go | 8 +- .../queryBuildProgressing/struct.go | 17 +- .../queryBuildProgressingNew/data.go | 8 +- .../queryBuildProgressingNew/struct.go | 17 +- .../queryBuildProgressingOne/data.go | 8 +- .../queryBuildProgressingOne/struct.go | 17 +- .../queryNearlyTwoYearsGenAndPrft/data.go | 8 +- .../queryNearlyTwoYearsGenAndPrft/struct.go | 17 +- .../querySaveEnergyPsSOH/data.go | 8 +- .../querySaveEnergyPsSOH/struct.go | 17 +- .../queryScreenUserMdIfo/data.go | 8 +- .../queryScreenUserMdIfo/struct.go | 17 +- .../saveOrUpdatePosition/data.go | 8 +- .../saveOrUpdatePosition/struct.go | 17 +- iSolarCloud/MttvScreenService/struct.go | 65 +- .../updateBuildProgressing/data.go | 8 +- .../updateBuildProgressing/struct.go | 17 +- iSolarCloud/NullArea/NullEndpoint/data.go | 6 +- iSolarCloud/NullArea/NullEndpoint/struct.go | 24 +- iSolarCloud/NullArea/struct.go | 8 +- .../queryPointDataTopOne/data.go | 8 +- .../queryPointDataTopOne/struct.go | 17 +- iSolarCloud/PowerPointService/struct.go | 7 +- iSolarCloud/WebAppService/addMaterial/data.go | 8 +- .../WebAppService/addMaterial/struct.go | 17 +- .../WebAppService/addOptTicketInfo/data.go | 8 +- .../WebAppService/addOptTicketInfo/struct.go | 17 +- .../WebAppService/addSpareParts/data.go | 8 +- .../WebAppService/addSpareParts/struct.go | 17 +- .../associateQueryFaultNames/data.go | 8 +- .../associateQueryFaultNames/struct.go | 17 +- .../WebAppService/auditPsDeviceCheck/data.go | 8 +- .../auditPsDeviceCheck/struct.go | 17 +- .../WebAppService/calcOutputRankByDay/data.go | 8 +- .../calcOutputRankByDay/struct.go | 17 +- .../WebAppService/changeReadStatus/data.go | 8 +- .../WebAppService/changeReadStatus/struct.go | 17 +- .../WebAppService/checkMaterialName/data.go | 8 +- .../WebAppService/checkMaterialName/struct.go | 17 +- .../WebAppService/confirmFault/data.go | 8 +- .../WebAppService/confirmFault/struct.go | 17 +- .../WebAppService/copeOperateTicket/data.go | 8 +- .../WebAppService/copeOperateTicket/struct.go | 17 +- .../copySecondTypeTicket/data.go | 8 +- .../copySecondTypeTicket/struct.go | 17 +- .../WebAppService/copyWorkTicket/data.go | 8 +- .../WebAppService/copyWorkTicket/struct.go | 17 +- .../WebAppService/delOptTicketInfo/data.go | 8 +- .../WebAppService/delOptTicketInfo/struct.go | 17 +- iSolarCloud/WebAppService/deleteDuty/data.go | 8 +- .../WebAppService/deleteDuty/struct.go | 17 +- .../WebAppService/deleteDutyMid/data.go | 8 +- .../WebAppService/deleteDutyMid/struct.go | 17 +- .../WebAppService/deleteMaterial/data.go | 8 +- .../WebAppService/deleteMaterial/struct.go | 17 +- .../deleteOrSharedSelfReport/data.go | 8 +- .../deleteOrSharedSelfReport/struct.go | 17 +- .../deleteSecondTypeTicket/data.go | 8 +- .../deleteSecondTypeTicket/struct.go | 17 +- .../deleteSparePartsById/data.go | 8 +- .../deleteSparePartsById/struct.go | 17 +- .../WebAppService/deleteWorkTicket/data.go | 8 +- .../WebAppService/deleteWorkTicket/struct.go | 17 +- .../WebAppService/deviceFactoryList/data.go | 8 +- .../WebAppService/deviceFactoryList/struct.go | 17 +- .../WebAppService/dispartDataPageList/data.go | 8 +- .../dispartDataPageList/struct.go | 17 +- iSolarCloud/WebAppService/executeTask/data.go | 8 +- .../WebAppService/executeTask/struct.go | 17 +- .../WebAppService/findCurrentTask/data.go | 8 +- .../WebAppService/findCurrentTask/struct.go | 17 +- .../findDeviceMessageByPskey/data.go | 8 +- .../findDeviceMessageByPskey/struct.go | 17 +- .../WebAppService/findFactoryMessage/data.go | 8 +- .../findFactoryMessage/struct.go | 17 +- .../WebAppService/findImgResources/data.go | 8 +- .../WebAppService/findImgResources/struct.go | 17 +- .../WebAppService/findMateiralSubType/data.go | 8 +- .../findMateiralSubType/struct.go | 17 +- .../WebAppService/findMaterialById/data.go | 8 +- .../WebAppService/findMaterialById/struct.go | 17 +- .../findMyDealedCurrentTask/data.go | 8 +- .../findMyDealedCurrentTask/struct.go | 17 +- .../findMyDealedImgResources/data.go | 8 +- .../findMyDealedImgResources/struct.go | 17 +- .../findSeriesInverterData/data.go | 8 +- .../findSeriesInverterData/struct.go | 17 +- iSolarCloud/WebAppService/findWebRole/data.go | 8 +- .../WebAppService/findWebRole/struct.go | 17 +- .../WebAppService/getAllPsFaultCount/data.go | 8 +- .../getAllPsFaultCount/struct.go | 17 +- .../getAllPsFaultCountByUserId/data.go | 8 +- .../getAllPsFaultCountByUserId/struct.go | 17 +- .../WebAppService/getAllPsList/data.go | 8 +- .../WebAppService/getAllPsList/struct.go | 17 +- iSolarCloud/WebAppService/getAllStore/data.go | 8 +- .../WebAppService/getAllStore/struct.go | 17 +- .../WebAppService/getBaseDeviceInfo/data.go | 8 +- .../WebAppService/getBaseDeviceInfo/struct.go | 17 +- iSolarCloud/WebAppService/getBoxData/data.go | 8 +- .../WebAppService/getBoxData/struct.go | 17 +- iSolarCloud/WebAppService/getCBoxTree/data.go | 8 +- .../WebAppService/getCBoxTree/struct.go | 17 +- .../WebAppService/getCheckDevTypeList/data.go | 8 +- .../getCheckDevTypeList/struct.go | 17 +- .../WebAppService/getCheckUserList/data.go | 8 +- .../WebAppService/getCheckUserList/struct.go | 17 +- iSolarCloud/WebAppService/getChildOrg/data.go | 8 +- .../WebAppService/getChildOrg/struct.go | 17 +- iSolarCloud/WebAppService/getCo/data.go | 8 +- iSolarCloud/WebAppService/getCo/struct.go | 17 +- .../WebAppService/getCodeTreeMap/data.go | 8 +- .../WebAppService/getCodeTreeMap/struct.go | 17 +- iSolarCloud/WebAppService/getDST/data.go | 8 +- iSolarCloud/WebAppService/getDST/struct.go | 17 +- .../WebAppService/getDataCounts/data.go | 8 +- .../WebAppService/getDataCounts/struct.go | 17 +- iSolarCloud/WebAppService/getDataInfo/data.go | 8 +- .../WebAppService/getDataInfo/struct.go | 17 +- iSolarCloud/WebAppService/getDevList/data.go | 8 +- .../WebAppService/getDevList/struct.go | 17 +- iSolarCloud/WebAppService/getDevName/data.go | 8 +- .../WebAppService/getDevName/struct.go | 17 +- .../WebAppService/getDevTypeList/data.go | 8 +- .../WebAppService/getDevTypeList/struct.go | 17 +- .../WebAppService/getDeviceDataList/data.go | 5 +- .../WebAppService/getDeviceDataList/struct.go | 17 +- .../WebAppService/getDeviceFactory/data.go | 8 +- .../WebAppService/getDeviceFactory/struct.go | 17 +- .../getDeviceInfoForCheck/data.go | 8 +- .../getDeviceInfoForCheck/struct.go | 17 +- .../WebAppService/getDevicePointAttrs/data.go | 129 +- .../getDevicePointAttrs/struct.go | 17 +- .../WebAppService/getDeviceTreeChild/data.go | 8 +- .../getDeviceTreeChild/struct.go | 17 +- .../WebAppService/getDeviceUuid/data.go | 9 +- .../WebAppService/getDeviceUuid/struct.go | 17 +- .../WebAppService/getDutyInfoById/data.go | 8 +- .../WebAppService/getDutyInfoById/struct.go | 17 +- .../WebAppService/getDutyOrgZtree/data.go | 8 +- .../WebAppService/getDutyOrgZtree/struct.go | 17 +- .../WebAppService/getElecEffectList/data.go | 8 +- .../WebAppService/getElecEffectList/struct.go | 17 +- .../WebAppService/getEnvironmentInfo/data.go | 8 +- .../getEnvironmentInfo/struct.go | 17 +- .../WebAppService/getFaultList/data.go | 8 +- .../WebAppService/getFaultList/struct.go | 17 +- .../WebAppService/getFaultName/data.go | 8 +- .../WebAppService/getFaultName/struct.go | 17 +- .../WebAppService/getFaultOrder/data.go | 8 +- .../WebAppService/getFaultOrder/struct.go | 17 +- .../getFaultOrderByOrderId/data.go | 8 +- .../getFaultOrderByOrderId/struct.go | 17 +- .../WebAppService/getFaultOrderList/data.go | 8 +- .../WebAppService/getFaultOrderList/struct.go | 17 +- .../getFaultOrderStepList/data.go | 8 +- .../getFaultOrderStepList/struct.go | 17 +- .../WebAppService/getHTRoleList/data.go | 8 +- .../WebAppService/getHTRoleList/struct.go | 17 +- .../WebAppService/getHistoryComments/data.go | 8 +- .../getHistoryComments/struct.go | 17 +- iSolarCloud/WebAppService/getInfo/data.go | 8 +- iSolarCloud/WebAppService/getInfo/struct.go | 17 +- .../getInverteTableListCount/data.go | 8 +- .../getInverteTableListCount/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../getInverterDiscreteList/data.go | 8 +- .../getInverterDiscreteList/struct.go | 17 +- .../getInverterFactoryList/data.go | 8 +- .../getInverterFactoryList/struct.go | 17 +- .../WebAppService/getInverterInfo/data.go | 11 +- .../WebAppService/getInverterInfo/struct.go | 17 +- .../WebAppService/getLoadCurveList/data.go | 14 +- .../WebAppService/getLoadCurveList/struct.go | 17 +- .../getMqttConfigInfoByAppkey/data.go | 18 +- .../getMqttConfigInfoByAppkey/struct.go | 17 +- .../WebAppService/getMultiPowers/data.go | 10 +- .../WebAppService/getMultiPowers/struct.go | 17 +- .../WebAppService/getOndutyQuery/data.go | 8 +- .../WebAppService/getOndutyQuery/struct.go | 17 +- .../getOperateTicketUserList/data.go | 8 +- .../getOperateTicketUserList/struct.go | 17 +- .../getOptTicketsAttachments/data.go | 8 +- .../getOptTicketsAttachments/struct.go | 17 +- .../WebAppService/getOrderCount/data.go | 8 +- .../WebAppService/getOrderCount/struct.go | 17 +- .../WebAppService/getOrderData/data.go | 7 +- .../WebAppService/getOrderData/struct.go | 17 +- .../WebAppService/getOrderDataSize/data.go | 8 +- .../WebAppService/getOrderDataSize/struct.go | 17 +- .../getOrgPsEquipmentList/data.go | 8 +- .../getOrgPsEquipmentList/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../WebAppService/getParentUidChain/data.go | 8 +- .../WebAppService/getParentUidChain/struct.go | 17 +- .../WebAppService/getPowerKwhkwpList/data.go | 8 +- .../getPowerKwhkwpList/struct.go | 17 +- .../WebAppService/getPowerPrList/data.go | 8 +- .../WebAppService/getPowerPrList/struct.go | 17 +- .../getPowerPredictionInfo/data.go | 8 +- .../getPowerPredictionInfo/struct.go | 17 +- .../getPowerTrendDayData/data.go | 8 +- .../getPowerTrendDayData/struct.go | 17 +- .../getPowerTrendMonthData/data.go | 8 +- .../getPowerTrendMonthData/struct.go | 17 +- .../getPowerTrendYearData/data.go | 8 +- .../getPowerTrendYearData/struct.go | 17 +- .../WebAppService/getPowerValue/data.go | 8 +- .../WebAppService/getPowerValue/struct.go | 17 +- iSolarCloud/WebAppService/getPsBlock/data.go | 8 +- .../WebAppService/getPsBlock/struct.go | 17 +- .../WebAppService/getPsBlockData/data.go | 8 +- .../WebAppService/getPsBlockData/struct.go | 17 +- .../WebAppService/getPsBlockTree/data.go | 8 +- .../WebAppService/getPsBlockTree/struct.go | 17 +- .../WebAppService/getPsBoxListCount/data.go | 8 +- .../WebAppService/getPsBoxListCount/struct.go | 17 +- .../WebAppService/getPsCBoxDetail/data.go | 7 +- .../WebAppService/getPsCBoxDetail/struct.go | 17 +- .../WebAppService/getPsContact/data.go | 8 +- .../WebAppService/getPsContact/struct.go | 17 +- .../WebAppService/getPsDataVal/data.go | 8 +- .../WebAppService/getPsDataVal/struct.go | 17 +- .../getPsDeviceCheckList/data.go | 8 +- .../getPsDeviceCheckList/struct.go | 17 +- .../getPsDeviceFaultList/data.go | 8 +- .../getPsDeviceFaultList/struct.go | 17 +- .../WebAppService/getPsFaultList/data.go | 8 +- .../WebAppService/getPsFaultList/struct.go | 17 +- .../WebAppService/getPsIdByUserId/data.go | 8 +- .../WebAppService/getPsIdByUserId/struct.go | 17 +- .../WebAppService/getPsIdState/data.go | 10 +- .../WebAppService/getPsIdState/struct.go | 17 +- iSolarCloud/WebAppService/getPsList/data.go | 13 +- iSolarCloud/WebAppService/getPsList/struct.go | 17 +- .../getPsListForWorkTicket/data.go | 8 +- .../getPsListForWorkTicket/struct.go | 17 +- .../WebAppService/getPsPictureMessage/data.go | 8 +- .../getPsPictureMessage/struct.go | 17 +- .../getPsTicketSizeAndClockNum/data.go | 8 +- .../getPsTicketSizeAndClockNum/struct.go | 17 +- iSolarCloud/WebAppService/getPsTree/data.go | 25 +- iSolarCloud/WebAppService/getPsTree/struct.go | 17 +- .../WebAppService/getPsTreeChild/data.go | 5 +- .../WebAppService/getPsTreeChild/struct.go | 17 +- .../WebAppService/getPsUserList/data.go | 5 +- .../WebAppService/getPsUserList/struct.go | 17 +- iSolarCloud/WebAppService/getPsValue/data.go | 9 +- .../WebAppService/getPsValue/struct.go | 17 +- .../WebAppService/getPscSeriseData/data.go | 8 +- .../WebAppService/getPscSeriseData/struct.go | 17 +- .../getReportInfoByReportId/data.go | 7 +- .../getReportInfoByReportId/struct.go | 17 +- .../WebAppService/getReportListByType/data.go | 10 +- .../getReportListByType/struct.go | 17 +- .../WebAppService/getReportPsTree/data.go | 11 +- .../WebAppService/getReportPsTree/struct.go | 17 +- iSolarCloud/WebAppService/getRoleList/data.go | 8 +- .../WebAppService/getRoleList/struct.go | 17 +- .../WebAppService/getSafeEffectList/data.go | 8 +- .../WebAppService/getSafeEffectList/struct.go | 17 +- .../getSecondTypeTicketList/data.go | 8 +- .../getSecondTypeTicketList/struct.go | 17 +- .../data.go | 8 +- .../struct.go | 17 +- .../WebAppService/getSelfReportPoint/data.go | 16 +- .../getSelfReportPoint/struct.go | 17 +- .../WebAppService/getSparePartsDetail/data.go | 8 +- .../getSparePartsDetail/struct.go | 17 +- .../WebAppService/getStatementList/data.go | 8 +- .../WebAppService/getStatementList/struct.go | 17 +- .../WebAppService/getStoreByStationId/data.go | 8 +- .../getStoreByStationId/struct.go | 17 +- .../WebAppService/getSysUserList/data.go | 8 +- .../WebAppService/getSysUserList/struct.go | 17 +- .../WebAppService/getTableList/data.go | 6 +- .../WebAppService/getTableList/struct.go | 17 +- iSolarCloud/WebAppService/getUserList/data.go | 8 +- .../WebAppService/getUserList/struct.go | 17 +- iSolarCloud/WebAppService/getWeather/data.go | 8 +- .../WebAppService/getWeather/struct.go | 17 +- .../WebAppService/getWorkTicketList/data.go | 8 +- .../WebAppService/getWorkTicketList/struct.go | 17 +- .../getWorkTicketListForTicketDetail/data.go | 8 +- .../struct.go | 17 +- .../getWorkTicketRunningCount/data.go | 8 +- .../getWorkTicketRunningCount/struct.go | 17 +- .../getWorkTicketUserList/data.go | 8 +- .../getWorkTicketUserList/struct.go | 17 +- .../WebAppService/getinverterType/data.go | 8 +- .../WebAppService/getinverterType/struct.go | 17 +- .../getreportPermissionByUser/data.go | 8 +- .../getreportPermissionByUser/struct.go | 17 +- iSolarCloud/WebAppService/handleValue/data.go | 8 +- .../WebAppService/handleValue/struct.go | 17 +- .../WebAppService/modifyDeviceInfo/data.go | 8 +- .../WebAppService/modifyDeviceInfo/struct.go | 17 +- .../operaStoreSpareParts/data.go | 8 +- .../operaStoreSpareParts/struct.go | 17 +- .../operateBillTransferToUser/data.go | 8 +- .../operateBillTransferToUser/struct.go | 17 +- .../queryAllStockInventory/data.go | 8 +- .../queryAllStockInventory/struct.go | 17 +- .../queryBatteryBoardsList/data.go | 12 +- .../queryBatteryBoardsList/struct.go | 17 +- .../queryBatteryBoardsPointsData/data.go | 8 +- .../queryBatteryBoardsPointsData/struct.go | 17 +- .../WebAppService/queryCodeByType/data.go | 8 +- .../WebAppService/queryCodeByType/struct.go | 17 +- .../WebAppService/queryDeviceInfoList/data.go | 8 +- .../queryDeviceInfoList/struct.go | 17 +- .../queryElectricityCalendarData/data.go | 8 +- .../queryElectricityCalendarData/struct.go | 17 +- .../WebAppService/queryFaultCodes/data.go | 8 +- .../WebAppService/queryFaultCodes/struct.go | 17 +- .../queryFaultLevelAndType/data.go | 8 +- .../queryFaultLevelAndType/struct.go | 17 +- .../WebAppService/queryFaultNames/data.go | 8 +- .../WebAppService/queryFaultNames/struct.go | 17 +- .../WebAppService/queryMaterialType/data.go | 8 +- .../WebAppService/queryMaterialType/struct.go | 17 +- .../WebAppService/queryNounAndKlgList/data.go | 8 +- .../queryNounAndKlgList/struct.go | 17 +- .../WebAppService/queryNounList/data.go | 8 +- .../WebAppService/queryNounList/struct.go | 17 +- .../WebAppService/queryOptTickctInfo/data.go | 8 +- .../queryOptTickctInfo/struct.go | 17 +- .../WebAppService/queryOrgIdByUser/data.go | 8 +- .../WebAppService/queryOrgIdByUser/struct.go | 17 +- .../WebAppService/queryPsCountryList/data.go | 8 +- .../queryPsCountryList/struct.go | 17 +- .../WebAppService/queryPsProvcnList/data.go | 8 +- .../WebAppService/queryPsProvcnList/struct.go | 17 +- .../WebAppService/queryPsTypeByPsId/data.go | 8 +- .../WebAppService/queryPsTypeByPsId/struct.go | 17 +- .../WebAppService/querySparePartsList/data.go | 8 +- .../querySparePartsList/struct.go | 17 +- .../WebAppService/queryStoreList/data.go | 8 +- .../WebAppService/queryStoreList/struct.go | 17 +- .../WebAppService/querySysTimezone/data.go | 8 +- .../WebAppService/querySysTimezone/struct.go | 17 +- .../queryUnInventorySpareList/data.go | 8 +- .../queryUnInventorySpareList/struct.go | 17 +- .../queryUserCurveTemplateData/data.go | 19 +- .../queryUserCurveTemplateData/struct.go | 17 +- .../WebAppService/renewOperation/data.go | 8 +- .../WebAppService/renewOperation/struct.go | 17 +- .../WebAppService/saveCustomReport/data.go | 8 +- .../WebAppService/saveCustomReport/struct.go | 17 +- .../WebAppService/saveDutyInfo/data.go | 8 +- .../WebAppService/saveDutyInfo/struct.go | 17 +- .../WebAppService/saveInventory/data.go | 8 +- .../WebAppService/saveInventory/struct.go | 17 +- .../WebAppService/saveMaterial/data.go | 8 +- .../WebAppService/saveMaterial/struct.go | 17 +- .../saveSecondTypeTicket/data.go | 8 +- .../saveSecondTypeTicket/struct.go | 17 +- .../WebAppService/saveSelfReportPoint/data.go | 8 +- .../saveSelfReportPoint/struct.go | 17 +- .../WebAppService/saveWorkTicket/data.go | 8 +- .../WebAppService/saveWorkTicket/struct.go | 17 +- .../secondTypeTicketFlowImplementStep/data.go | 8 +- .../struct.go | 17 +- .../secondTypeTicketFlowTransferStep/data.go | 8 +- .../struct.go | 17 +- .../secondTypeUpdateSign/data.go | 8 +- .../secondTypeUpdateSign/struct.go | 17 +- .../WebAppService/selectPowerPageList/data.go | 8 +- .../selectPowerPageList/struct.go | 17 +- .../WebAppService/showAnalyzefxDetail/data.go | 8 +- .../showAnalyzefxDetail/struct.go | 17 +- .../WebAppService/showFxReport/data.go | 8 +- .../WebAppService/showFxReport/struct.go | 17 +- .../WebAppService/showMaterNameList/data.go | 8 +- .../WebAppService/showMaterNameList/struct.go | 17 +- .../showMaterSubTypeList/data.go | 8 +- .../showMaterSubTypeList/struct.go | 17 +- iSolarCloud/WebAppService/showPSView/data.go | 7 +- .../WebAppService/showPSView/struct.go | 17 +- .../WebAppService/showTjReport/data.go | 9 +- .../WebAppService/showTjReport/struct.go | 17 +- iSolarCloud/WebAppService/struct.go | 388 +++--- .../WebAppService/templateLikesInfo/data.go | 8 +- .../WebAppService/templateLikesInfo/struct.go | 17 +- .../WebAppService/updOptTicketInfo/data.go | 8 +- .../WebAppService/updOptTicketInfo/struct.go | 17 +- .../updataWorkTicketAfterStartProcess/data.go | 8 +- .../struct.go | 17 +- .../updateBillTicketForTask/data.go | 8 +- .../updateBillTicketForTask/struct.go | 17 +- .../WebAppService/updateDutyInfo/data.go | 8 +- .../WebAppService/updateDutyInfo/struct.go | 17 +- .../updateKnowledgeBaseUseNumber/data.go | 8 +- .../updateKnowledgeBaseUseNumber/struct.go | 17 +- .../WebAppService/updateMaterial/data.go | 8 +- .../WebAppService/updateMaterial/struct.go | 17 +- .../WebAppService/updateSpareParts/data.go | 8 +- .../WebAppService/updateSpareParts/struct.go | 17 +- .../WebAppService/updateStopReason/data.go | 8 +- .../WebAppService/updateStopReason/struct.go | 17 +- .../WebAppService/updateTemplate/data.go | 8 +- .../WebAppService/updateTemplate/struct.go | 17 +- .../addPowerDeviceModel/data.go | 8 +- .../addPowerDeviceModel/struct.go | 17 +- .../addPowerPointManage/data.go | 8 +- .../addPowerPointManage/struct.go | 17 +- .../addSubTypeDevice/data.go | 8 +- .../addSubTypeDevice/struct.go | 17 +- .../batchAddDevicesPropertis/data.go | 8 +- .../batchAddDevicesPropertis/struct.go | 17 +- .../WebIscmAppService/batchDelDevice/data.go | 8 +- .../batchDelDevice/struct.go | 17 +- .../batchSavePowerDeviceTechnical/data.go | 8 +- .../batchSavePowerDeviceTechnical/struct.go | 17 +- .../checkDeviceModel/data.go | 6 +- .../checkDeviceModel/struct.go | 17 +- .../contactMessageOpera/data.go | 4 +- .../contactMessageOpera/struct.go | 17 +- .../WebIscmAppService/delDevice/data.go | 8 +- .../WebIscmAppService/delDevice/struct.go | 17 +- .../deleteDeviceFactory/data.go | 8 +- .../deleteDeviceFactory/struct.go | 17 +- .../deleteDeviceType/data.go | 8 +- .../deleteDeviceType/struct.go | 17 +- .../WebIscmAppService/deleteMenu/data.go | 8 +- .../WebIscmAppService/deleteMenu/struct.go | 17 +- .../WebIscmAppService/deleteOneNotice/data.go | 8 +- .../deleteOneNotice/struct.go | 17 +- .../deleteOrgNodeInfo/data.go | 8 +- .../deleteOrgNodeInfo/struct.go | 17 +- .../WebIscmAppService/deletePicture/data.go | 8 +- .../WebIscmAppService/deletePicture/struct.go | 17 +- .../WebIscmAppService/deletePointInfo/data.go | 8 +- .../deletePointInfo/struct.go | 17 +- .../deletePowerDeviceChannl/data.go | 8 +- .../deletePowerDeviceChannl/struct.go | 17 +- .../deletePowerDeviceModel/data.go | 8 +- .../deletePowerDeviceModel/struct.go | 17 +- .../deletePowerDeviceParameterPage/data.go | 8 +- .../deletePowerDeviceParameterPage/struct.go | 17 +- .../deletePowerDeviceSubType/data.go | 8 +- .../deletePowerDeviceSubType/struct.go | 17 +- .../deletePowerDeviceTechnical/data.go | 8 +- .../deletePowerDeviceTechnical/struct.go | 17 +- .../deletePowerStore/data.go | 8 +- .../deletePowerStore/struct.go | 17 +- .../deleteProcessDefinition/data.go | 8 +- .../deleteProcessDefinition/struct.go | 17 +- .../WebIscmAppService/deleteReport/data.go | 8 +- .../WebIscmAppService/deleteReport/struct.go | 17 +- .../WebIscmAppService/deleteUserNode/data.go | 8 +- .../deleteUserNode/struct.go | 17 +- .../WebIscmAppService/deployProcess/data.go | 8 +- .../WebIscmAppService/deployProcess/struct.go | 17 +- .../editProcessManageAction/data.go | 8 +- .../editProcessManageAction/struct.go | 17 +- .../findImageInputStreamString/data.go | 4 +- .../findImageInputStreamString/struct.go | 17 +- .../getAllDevTypeList/data.go | 13 +- .../getAllDevTypeList/struct.go | 17 +- .../getAllNodeByType/data.go | 4 +- .../getAllNodeByType/struct.go | 17 +- .../WebIscmAppService/getAuthKey/data.go | 4 +- .../WebIscmAppService/getAuthKey/struct.go | 17 +- .../WebIscmAppService/getAuthKeyList/data.go | 6 +- .../getAuthKeyList/struct.go | 17 +- .../WebIscmAppService/getCodeByType/data.go | 6 +- .../WebIscmAppService/getCodeByType/struct.go | 17 +- .../getContactMessage/data.go | 8 +- .../getContactMessage/struct.go | 17 +- .../WebIscmAppService/getCountryNew/data.go | 8 +- .../WebIscmAppService/getCountryNew/struct.go | 17 +- .../getDefinitionIdByKey/data.go | 4 +- .../getDefinitionIdByKey/struct.go | 17 +- .../getDeploymentList/data.go | 10 +- .../getDeploymentList/struct.go | 17 +- .../getDeviceFactoryListByIds/data.go | 6 +- .../getDeviceFactoryListByIds/struct.go | 17 +- .../WebIscmAppService/getDeviceModel/data.go | 11 +- .../getDeviceModel/struct.go | 17 +- .../WebIscmAppService/getDevicePro/data.go | 4 +- .../WebIscmAppService/getDevicePro/struct.go | 17 +- .../getDeviceSubType/data.go | 8 +- .../getDeviceSubType/struct.go | 17 +- .../getDeviceTechnical/data.go | 6 +- .../getDeviceTechnical/struct.go | 17 +- .../WebIscmAppService/getDeviceType/data.go | 6 +- .../WebIscmAppService/getDeviceType/struct.go | 17 +- .../getDeviceTypeInfoById/data.go | 28 +- .../getDeviceTypeInfoById/struct.go | 17 +- .../WebIscmAppService/getDutyUserList/data.go | 8 +- .../getDutyUserList/struct.go | 17 +- .../getFatherPrivileges/data.go | 8 +- .../getFatherPrivileges/struct.go | 17 +- .../getGroupManSettings/data.go | 6 +- .../getGroupManSettings/struct.go | 17 +- .../getGroupManSettingsMembers/data.go | 8 +- .../getGroupManSettingsMembers/struct.go | 17 +- .../getMaterialByListId/data.go | 8 +- .../getMaterialByListId/struct.go | 17 +- .../getMaterialByType/data.go | 4 +- .../getMaterialByType/struct.go | 17 +- .../WebIscmAppService/getMaterialList/data.go | 4 +- .../getMaterialList/struct.go | 17 +- .../getMaxDeviceIdByPsId/data.go | 10 +- .../getMaxDeviceIdByPsId/struct.go | 17 +- .../WebIscmAppService/getModelPoints/data.go | 9 +- .../getModelPoints/struct.go | 17 +- .../getMoneyUnitList/data.go | 10 +- .../getMoneyUnitList/struct.go | 17 +- .../WebIscmAppService/getNamecnNew/data.go | 8 +- .../WebIscmAppService/getNamecnNew/struct.go | 17 +- .../WebIscmAppService/getNationList/data.go | 11 +- .../WebIscmAppService/getNationList/struct.go | 17 +- .../getOperationRecord/data.go | 8 +- .../getOperationRecord/struct.go | 17 +- .../getOrgAndChildBasicInfoOptions/data.go | 8 +- .../getOrgAndChildBasicInfoOptions/struct.go | 17 +- .../getOrgAndStateAndCode/data.go | 8 +- .../getOrgAndStateAndCode/struct.go | 17 +- .../WebIscmAppService/getOrgForPs/data.go | 8 +- .../WebIscmAppService/getOrgForPs/struct.go | 17 +- .../WebIscmAppService/getOrgList/data.go | 9 +- .../WebIscmAppService/getOrgList/struct.go | 17 +- .../getOrgListForUser/data.go | 8 +- .../getOrgListForUser/struct.go | 17 +- .../WebIscmAppService/getOrgNodeInfo/data.go | 8 +- .../getOrgNodeInfo/struct.go | 17 +- .../getOrgStationList/data.go | 6 +- .../getOrgStationList/struct.go | 17 +- .../getOrgStationListByPage/data.go | 8 +- .../getOrgStationListByPage/struct.go | 17 +- .../WebIscmAppService/getOrgUserList/data.go | 8 +- .../getOrgUserList/struct.go | 17 +- .../getOrgUserMapData/data.go | 7 +- .../getOrgUserMapData/struct.go | 17 +- .../WebIscmAppService/getOrgZtree/data.go | 8 +- .../WebIscmAppService/getOrgZtree/struct.go | 17 +- .../getOrgZtree4User/data.go | 8 +- .../getOrgZtree4User/struct.go | 17 +- .../getOrgZtreeAsync/data.go | 8 +- .../getOrgZtreeAsync/struct.go | 17 +- .../getOrgZtreeForUser/data.go | 8 +- .../getOrgZtreeForUser/struct.go | 17 +- .../WebIscmAppService/getPictureList/data.go | 8 +- .../getPictureList/struct.go | 17 +- .../WebIscmAppService/getPointInfo/data.go | 7 +- .../WebIscmAppService/getPointInfo/struct.go | 17 +- .../getPointInfoPage/data.go | 7 +- .../getPointInfoPage/struct.go | 17 +- .../WebIscmAppService/getPowerDevice/data.go | 7 +- .../getPowerDevice/struct.go | 17 +- .../getPowerDeviceChannl/data.go | 7 +- .../getPowerDeviceChannl/struct.go | 17 +- .../getPowerDeviceFactory/data.go | 9 +- .../getPowerDeviceFactory/struct.go | 17 +- .../getPowerDeviceFactoryListCount/data.go | 9 +- .../getPowerDeviceFactoryListCount/struct.go | 17 +- .../getPowerDeviceInfo/data.go | 8 +- .../getPowerDeviceInfo/struct.go | 17 +- .../getPowerDeviceModelList/data.go | 11 +- .../getPowerDeviceModelList/struct.go | 17 +- .../getPowerDeviceModelTechList/data.go | 10 +- .../getPowerDeviceModelTechList/struct.go | 17 +- .../getPowerDeviceTypeList/data.go | 30 +- .../getPowerDeviceTypeList/struct.go | 17 +- .../getPowerPlanList/data.go | 11 +- .../getPowerPlanList/struct.go | 17 +- .../WebIscmAppService/getPowerStation/data.go | 6 +- .../getPowerStation/struct.go | 17 +- .../getPowerStationInfo/data.go | 19 +- .../getPowerStationInfo/struct.go | 17 +- .../getPowerStationList/data.go | 8 +- .../getPowerStationList/struct.go | 17 +- .../WebIscmAppService/getPowerStore/data.go | 4 +- .../WebIscmAppService/getPowerStore/struct.go | 17 +- .../WebIscmAppService/getProvcnNew/data.go | 4 +- .../WebIscmAppService/getProvcnNew/struct.go | 17 +- .../WebIscmAppService/getPsTreeMenu/data.go | 6 +- .../WebIscmAppService/getPsTreeMenu/struct.go | 17 +- .../getRoleByUserIds/data.go | 8 +- .../getRoleByUserIds/struct.go | 17 +- .../getRootOrgInfoByUserId/data.go | 8 +- .../getRootOrgInfoByUserId/struct.go | 17 +- .../getSettingUserMapData/data.go | 8 +- .../getSettingUserMapData/struct.go | 17 +- .../WebIscmAppService/getStateNew/data.go | 8 +- .../WebIscmAppService/getStateNew/struct.go | 17 +- .../getSubTypeDevice/data.go | 8 +- .../getSubTypeDevice/struct.go | 17 +- .../WebIscmAppService/getSysHomeList2/data.go | 6 +- .../getSysHomeList2/struct.go | 17 +- .../WebIscmAppService/getSysMenu/data.go | 52 +- .../WebIscmAppService/getSysMenu/struct.go | 17 +- .../WebIscmAppService/getSysOrgPro/data.go | 4 +- .../WebIscmAppService/getSysOrgPro/struct.go | 17 +- .../WebIscmAppService/getSysUser/data.go | 6 +- .../WebIscmAppService/getSysUser/struct.go | 17 +- .../getSystemOrgInfo/data.go | 8 +- .../getSystemOrgInfo/struct.go | 17 +- .../getSystemRoleInfo/data.go | 4 +- .../getSystemRoleInfo/struct.go | 17 +- .../getSystemRoleList2/data.go | 8 +- .../getSystemRoleList2/struct.go | 17 +- .../WebIscmAppService/getTownValueNew/data.go | 8 +- .../getTownValueNew/struct.go | 17 +- .../WebIscmAppService/getUserMenuLs/data.go | 9 +- .../WebIscmAppService/getUserMenuLs/struct.go | 17 +- .../WebIscmAppService/getUserOrgPage/data.go | 8 +- .../getUserOrgPage/struct.go | 17 +- .../WebIscmAppService/getVillageList/data.go | 9 +- .../getVillageList/struct.go | 17 +- .../getVillageListNew/data.go | 8 +- .../getVillageListNew/struct.go | 17 +- .../getZtreeAsyncSysMenu/data.go | 8 +- .../getZtreeAsyncSysMenu/struct.go | 17 +- .../getZtreeChildMenu/data.go | 8 +- .../getZtreeChildMenu/struct.go | 17 +- .../WebIscmAppService/getZtreeMenu/data.go | 6 +- .../WebIscmAppService/getZtreeMenu/struct.go | 17 +- .../WebIscmAppService/getZtreeSysMenu/data.go | 8 +- .../getZtreeSysMenu/struct.go | 17 +- .../getZtreeSysMenu2/data.go | 8 +- .../getZtreeSysMenu2/struct.go | 17 +- .../goToDevicePropertyPage/data.go | 8 +- .../goToDevicePropertyPage/struct.go | 17 +- .../WebIscmAppService/isCanAddUser/data.go | 8 +- .../WebIscmAppService/isCanAddUser/struct.go | 17 +- .../isHasIrradiationData/data.go | 8 +- .../isHasIrradiationData/struct.go | 17 +- .../WebIscmAppService/isHasPlan/data.go | 8 +- .../WebIscmAppService/isHasPlan/struct.go | 17 +- .../WebIscmAppService/loadDevice/data.go | 8 +- .../WebIscmAppService/loadDevice/struct.go | 17 +- .../WebIscmAppService/modelPointsPage/data.go | 13 +- .../modelPointsPage/struct.go | 18 +- .../WebIscmAppService/modifyDevice/data.go | 8 +- .../WebIscmAppService/modifyDevice/struct.go | 17 +- .../modifyPowerDeviceChannl/data.go | 8 +- .../modifyPowerDeviceChannl/struct.go | 17 +- .../WebIscmAppService/modifySysOrg/data.go | 8 +- .../WebIscmAppService/modifySysOrg/struct.go | 17 +- .../modifySystemMenu/data.go | 8 +- .../modifySystemMenu/struct.go | 17 +- .../modifySystemOrgNode/data.go | 8 +- .../modifySystemOrgNode/struct.go | 17 +- .../modifySystemRole/data.go | 8 +- .../modifySystemRole/struct.go | 17 +- .../modifySystemUser/data.go | 8 +- .../modifySystemUser/struct.go | 17 +- .../WebIscmAppService/publishNotice/data.go | 8 +- .../WebIscmAppService/publishNotice/struct.go | 17 +- .../queryDeviceListForBackSys/data.go | 13 +- .../queryDeviceListForBackSys/struct.go | 17 +- .../WebIscmAppService/queryDutyType/data.go | 9 +- .../WebIscmAppService/queryDutyType/struct.go | 17 +- .../queryReportDataById/data.go | 8 +- .../queryReportDataById/struct.go | 17 +- .../WebIscmAppService/resetPasW/data.go | 8 +- .../WebIscmAppService/resetPasW/struct.go | 17 +- .../WebIscmAppService/saveAuthKey/data.go | 8 +- .../WebIscmAppService/saveAuthKey/struct.go | 17 +- .../WebIscmAppService/saveDevice/data.go | 8 +- .../WebIscmAppService/saveDevice/struct.go | 17 +- .../saveDeviceFactory/data.go | 8 +- .../saveDeviceFactory/struct.go | 17 +- .../WebIscmAppService/saveDeviceType/data.go | 8 +- .../saveDeviceType/struct.go | 17 +- .../saveIrradiationData/data.go | 8 +- .../saveIrradiationData/struct.go | 17 +- .../WebIscmAppService/saveModelPoints/data.go | 8 +- .../saveModelPoints/struct.go | 17 +- .../WebIscmAppService/saveNewNotice/data.go | 8 +- .../WebIscmAppService/saveNewNotice/struct.go | 17 +- .../saveOrUpdateReport/data.go | 8 +- .../saveOrUpdateReport/struct.go | 17 +- .../WebIscmAppService/saveOrgNode/data.go | 8 +- .../WebIscmAppService/saveOrgNode/struct.go | 17 +- .../WebIscmAppService/saveOrgUsers/data.go | 8 +- .../WebIscmAppService/saveOrgUsers/struct.go | 17 +- .../WebIscmAppService/savePicture/data.go | 8 +- .../WebIscmAppService/savePicture/struct.go | 17 +- .../WebIscmAppService/savePointManage/data.go | 8 +- .../savePointManage/struct.go | 17 +- .../savePowerDeviceChannl/data.go | 8 +- .../savePowerDeviceChannl/struct.go | 17 +- .../savePowerDeviceModel/data.go | 8 +- .../savePowerDeviceModel/struct.go | 17 +- .../savePowerDeviceParameterPage/data.go | 8 +- .../savePowerDeviceParameterPage/struct.go | 17 +- .../savePowerDeviceSubType/data.go | 8 +- .../savePowerDeviceSubType/struct.go | 17 +- .../savePowerDeviceTechnical/data.go | 8 +- .../savePowerDeviceTechnical/struct.go | 17 +- .../WebIscmAppService/savePowerPlan/data.go | 8 +- .../WebIscmAppService/savePowerPlan/struct.go | 17 +- .../savePowerStationByPowerStore/data.go | 8 +- .../savePowerStationByPowerStore/struct.go | 17 +- .../WebIscmAppService/savePowerStore/data.go | 8 +- .../savePowerStore/struct.go | 17 +- .../WebIscmAppService/savePsOrg/data.go | 8 +- .../WebIscmAppService/savePsOrg/struct.go | 17 +- .../WebIscmAppService/saveRelDevice/data.go | 8 +- .../WebIscmAppService/saveRelDevice/struct.go | 17 +- .../WebIscmAppService/saveRoleAssign/data.go | 8 +- .../saveRoleAssign/struct.go | 17 +- .../WebIscmAppService/saveSysMenu/data.go | 8 +- .../WebIscmAppService/saveSysMenu/struct.go | 17 +- .../WebIscmAppService/saveSysOrg/data.go | 8 +- .../WebIscmAppService/saveSysOrg/struct.go | 17 +- .../WebIscmAppService/saveSysRole/data.go | 8 +- .../WebIscmAppService/saveSysRole/struct.go | 17 +- .../WebIscmAppService/saveSysUser/data.go | 8 +- .../WebIscmAppService/saveSysUser/struct.go | 17 +- .../WebIscmAppService/saveUserNode/data.go | 8 +- .../WebIscmAppService/saveUserNode/struct.go | 17 +- .../WebIscmAppService/saveUserRole/data.go | 8 +- .../WebIscmAppService/saveUserRole/struct.go | 17 +- .../searchIrradiationData/data.go | 8 +- .../searchIrradiationData/struct.go | 17 +- .../searchTechnicalNums/data.go | 8 +- .../searchTechnicalNums/struct.go | 17 +- .../selectDeviceTypeByPsId/data.go | 8 +- .../selectDeviceTypeByPsId/struct.go | 17 +- .../selectPowerDeviceTechnicals/data.go | 8 +- .../selectPowerDeviceTechnicals/struct.go | 17 +- .../selectPowerDeviceType/data.go | 8 +- .../selectPowerDeviceType/struct.go | 17 +- .../setupUserRole4AddUser/data.go | 8 +- .../setupUserRole4AddUser/struct.go | 17 +- .../WebIscmAppService/startWorkFlow/data.go | 8 +- .../WebIscmAppService/startWorkFlow/struct.go | 17 +- iSolarCloud/WebIscmAppService/struct.go | 415 +++--- .../WebIscmAppService/updateDevice/data.go | 6 +- .../WebIscmAppService/updateDevice/struct.go | 17 +- .../updateDeviceType/data.go | 6 +- .../updateDeviceType/struct.go | 17 +- .../updateFaultLevel/data.go | 8 +- .../updateFaultLevel/struct.go | 17 +- .../WebIscmAppService/updateNotice/data.go | 6 +- .../WebIscmAppService/updateNotice/struct.go | 17 +- .../WebIscmAppService/updatePointInfo/data.go | 18 +- .../updatePointInfo/struct.go | 17 +- .../updatePowerDeviceModel/data.go | 8 +- .../updatePowerDeviceModel/struct.go | 17 +- .../updatePowerDeviceParameterPage/data.go | 8 +- .../updatePowerDeviceParameterPage/struct.go | 17 +- .../updatePowerDeviceSubType/data.go | 6 +- .../updatePowerDeviceSubType/struct.go | 17 +- .../updatePowerDeviceTechnical/data.go | 8 +- .../updatePowerDeviceTechnical/struct.go | 17 +- .../updateProcessManage/data.go | 8 +- .../updateProcessManage/struct.go | 17 +- .../WebIscmAppService/updateSysOrgPro/data.go | 6 +- .../updateSysOrgPro/struct.go | 17 +- .../updateSysRoleValidFlag/data.go | 6 +- .../updateSysRoleValidFlag/struct.go | 20 +- .../updateUserValidFlag/data.go | 6 +- .../updateUserValidFlag/struct.go | 17 +- .../WebIscmAppService/updateValidFlag/data.go | 7 +- .../updateValidFlag/struct.go | 20 +- .../WebIscmAppService/viewDeviceModel/data.go | 7 +- .../viewDeviceModel/struct.go | 20 +- .../viewDeviceParameter/data.go | 7 +- .../viewDeviceParameter/struct.go | 20 +- .../workFlowImplementStep/data.go | 6 +- .../workFlowImplementStep/struct.go | 20 +- .../WebIscmAppService/workFlowIsStart/data.go | 6 +- .../workFlowIsStart/struct.go | 20 +- .../workFlowTransferStep/data.go | 6 +- .../workFlowTransferStep/struct.go | 20 +- .../api/GoStruct/output/struct_graph.go | 120 +- .../api/GoStruct/output/struct_json.go | 5 +- .../api/GoStruct/output/struct_table.go | 78 +- iSolarCloud/api/GoStruct/reflection/funcs.go | 102 +- iSolarCloud/api/GoStruct/struct_reflect.go | 1074 +++++++-------- iSolarCloud/api/GoStruct/struct_table.go | 95 +- iSolarCloud/api/GoStruct/structmap.go | 123 +- iSolarCloud/api/file.go | 11 +- iSolarCloud/api/interface_area.go | 3 +- iSolarCloud/api/interface_endpoint.go | 3 +- iSolarCloud/api/struct_areas.go | 7 +- iSolarCloud/api/struct_data.go | 66 +- iSolarCloud/api/struct_de.go | 21 +- iSolarCloud/api/struct_endpoint.go | 11 +- iSolarCloud/api/struct_point.go | 125 +- iSolarCloud/api/struct_template_points.go | 7 +- iSolarCloud/api/types.go | 5 +- iSolarCloud/api/utils.go | 6 +- iSolarCloud/api/web.go | 14 +- iSolarCloud/data.go | 63 +- iSolarCloud/data_request.go | 1206 +++++++++-------- iSolarCloud/highlevel.go | 28 +- iSolarCloud/highlevel_device.go | 35 +- iSolarCloud/highlevel_meta.go | 9 +- iSolarCloud/highlevel_point.go | 100 +- iSolarCloud/highlevel_ps.go | 278 ++-- iSolarCloud/highlevel_template.go | 11 +- iSolarCloud/struct.go | 126 +- main.go | 4 +- mmHa/options.go | 18 +- mmHa/struct.go | 610 +++++---- tablib/tablib_tabular.go | 5 +- 2014 files changed, 13600 insertions(+), 20345 deletions(-) diff --git a/cmd/cmd_api.go b/cmd/cmd_api.go index 53b772a46..a80f18de5 100644 --- a/cmd/cmd_api.go +++ b/cmd/cmd_api.go @@ -1,20 +1,20 @@ package cmd import ( - "GoSungrow/iSolarCloud" - "GoSungrow/iSolarCloud/AppService/login" - "GoSungrow/iSolarCloud/api/GoStruct/output" "errors" "fmt" + "time" + + "github.com/MickMake/GoSungrow/iSolarCloud" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/login" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdConfig" "github.com/MickMake/GoUnify/cmdHelp" "github.com/spf13/cobra" "github.com/spf13/viper" - "time" ) - const ( flagApiUrl = "host" flagApiTimeout = "timeout" @@ -31,27 +31,26 @@ type CmdApi struct { CmdDefault // iSolarCloud api - ApiTimeout time.Duration - Url string - Username string - Password string - AppKey string - LastLogin string - ApiToken string + ApiTimeout time.Duration + Url string + Username string + Password string + AppKey string + LastLogin string + ApiToken string ApiTokenFile string - OutputType string - SaveFile bool + OutputType string + SaveFile bool SunGrow *iSolarCloud.SunGrow } - func NewCmdApi() *CmdApi { var ret *CmdApi for range Only.Once { - ret = &CmdApi { - CmdDefault: CmdDefault { + ret = &CmdApi{ + CmdDefault: CmdDefault{ Error: nil, cmd: nil, SelfCmd: nil, @@ -121,7 +120,7 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { c.Error = c.ApiLogin(true) if c.Error != nil { return c.Error @@ -130,7 +129,7 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { c.SunGrow.Auth.Print() return nil }, - Args: cobra.MinimumNArgs(0), + Args: cobra.MinimumNArgs(0), } cmdApi.AddCommand(cmdApiLogin) cmdApiLogin.Example = cmdHelp.PrintExamples(cmdApiLogin, "") @@ -145,12 +144,12 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { c.SunGrow.SaveAsFile = false c.SunGrow.OutputType.SetJson() return c.CmdApiGet(cmd, args) }, - Args: cobra.MinimumNArgs(1), + Args: cobra.MinimumNArgs(1), } cmdApi.AddCommand(cmdApiGet) cmdApiGet.Example = cmdHelp.PrintExamples(cmdApiGet, "[area].") @@ -165,12 +164,12 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { c.SunGrow.SaveAsFile = false c.SunGrow.OutputType.SetRaw() return c.CmdApiGet(cmd, args) }, - Args: cobra.MinimumNArgs(1), + Args: cobra.MinimumNArgs(1), } cmdApi.AddCommand(cmdApiRaw) cmdApiRaw.Example = cmdHelp.PrintExamples(cmdApiRaw, "[area].") @@ -185,12 +184,12 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { c.SunGrow.SaveAsFile = true c.SunGrow.OutputType.SetJson() return c.CmdApiGet(cmd, args) }, - Args: cobra.MinimumNArgs(1), + Args: cobra.MinimumNArgs(1), } cmdApi.AddCommand(cmdApiSave) cmdApiSave.Example = cmdHelp.PrintExamples(cmdApiSave, "[area].") @@ -205,12 +204,12 @@ func (c *CmdApi) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { // c.SunGrow.SaveAsFile = true c.SunGrow.OutputType.SetStruct() return c.CmdApiGet(cmd, args) }, - Args: cobra.MinimumNArgs(1), + Args: cobra.MinimumNArgs(1), } cmdApi.AddCommand(cmdApiStruct) cmdApiStruct.Example = cmdHelp.PrintExamples(cmdApiStruct, "[area].") @@ -258,7 +257,6 @@ func (c *CmdApi) AttachFlags(cmd *cobra.Command, viper *viper.Viper) { } } - func (ca *Cmds) SunGrowArgs(cmd *cobra.Command, args []string) error { for range Only.Once { ca.Error = cmds.ProcessArgs(cmd, args) @@ -307,7 +305,6 @@ func (ca *Cmds) SetOutputType(cmd *cobra.Command) error { return err } - func (c *CmdApi) CmdApi(cmd *cobra.Command, args []string) { for range Only.Once { if len(args) == 0 { @@ -320,18 +317,18 @@ func (c *CmdApi) CmdApi(cmd *cobra.Command, args []string) { func (c *CmdApi) CmdApiList(cmd *cobra.Command, args []string) { for range Only.Once { switch { - case len(args) == 0: - fmt.Println("Unknown sub-command.") - _ = cmd.Help() + case len(args) == 0: + fmt.Println("Unknown sub-command.") + _ = cmd.Help() - case args[0] == "endpoints": - c.Error = c.SunGrow.ListEndpoints("") + case args[0] == "endpoints": + c.Error = c.SunGrow.ListEndpoints("") - case args[0] == "areas": - c.SunGrow.ListAreas() + case args[0] == "areas": + c.SunGrow.ListAreas() - default: - c.Error = c.SunGrow.ListEndpoints(args[0]) + default: + c.Error = c.SunGrow.ListEndpoints(args[0]) } } } @@ -374,15 +371,14 @@ func (c *CmdApi) CmdApiPut(_ *cobra.Command, _ []string) { } } - -func (c *CmdApi) ApiLogin(force bool) error { +func (c *CmdApi) ApiLogin(force bool) error { for range Only.Once { if c.SunGrow == nil { c.Error = errors.New("sungrow instance not configured") break } - auth := login.SunGrowAuth { + auth := login.SunGrowAuth{ AppKey: c.AppKey, UserAccount: c.Username, UserPassword: c.Password, @@ -399,7 +395,7 @@ func (c *CmdApi) ApiLogin(force bool) error { c.ApiToken = c.SunGrow.GetToken() sf := cmds.Api.SaveFile - cmds.Api.SaveFile = false // We don't want to lock this in the config. + cmds.Api.SaveFile = false // We don't want to lock this in the config. c.Error = cmds.Unify.WriteConfig() cmds.Api.SaveFile = sf } @@ -407,7 +403,6 @@ func (c *CmdApi) ApiLogin(force bool) error { return c.Error } - func MinimumArraySize(count int, args []string) []string { var ret []string for range Only.Once { diff --git a/cmd/cmd_data.go b/cmd/cmd_data.go index ff0ae95d3..46d48c823 100644 --- a/cmd/cmd_data.go +++ b/cmd/cmd_data.go @@ -1,15 +1,15 @@ package cmd import ( - "GoSungrow/iSolarCloud" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/spf13/cobra" ) - //goland:noinspection GoNameStartsWithPackageName type CmdData CmdDefault @@ -44,10 +44,10 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { return cmd.Help() }, - Args: cobra.MinimumNArgs(0), + Args: cobra.MinimumNArgs(0), } cmd.AddCommand(c.SelfCmd) c.SelfCmd.Example = cmdHelp.PrintExamples(c.SelfCmd, "get ", "put ") @@ -215,7 +215,6 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command { return c.SelfCmd } - func (c *CmdData) GetEndpoints(cmd *cobra.Command, args []string) error { // endpoints string, psIds string, date string for range Only.Once { diff --git a/cmd/cmd_ha.go b/cmd/cmd_ha.go index fc4df2f68..f09ff8f91 100644 --- a/cmd/cmd_ha.go +++ b/cmd/cmd_ha.go @@ -1,17 +1,17 @@ package cmd import ( - "GoSungrow/iSolarCloud" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + "strings" + + "github.com/MickMake/GoSungrow/iSolarCloud" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/MickMake/GoUnify/cmdPath" "github.com/spf13/cobra" - "strings" ) - //goland:noinspection GoNameStartsWithPackageName type CmdHa CmdDefault @@ -46,7 +46,7 @@ func (c *CmdHa) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagParsing: false, DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, args []string) error { return cmd.Help() }, Args: cobra.MinimumNArgs(1), @@ -65,7 +65,7 @@ func (c *CmdHa) AttachCommand(cmd *cobra.Command) *cobra.Command { DisableFlagsInUseLine: false, PreRunE: cmds.SunGrowArgs, RunE: c.CmdLovelace, - Args: cobra.MinimumNArgs(0), + Args: cobra.MinimumNArgs(0), } c.SelfCmd.AddCommand(cmdHaGet) cmdHaGet.Example = cmdHelp.PrintExamples(cmdHaGet, "[area.]") @@ -73,7 +73,6 @@ func (c *CmdHa) AttachCommand(cmd *cobra.Command) *cobra.Command { return c.SelfCmd } - func (c *CmdHa) CmdLovelace(cmd *cobra.Command, args []string) error { for range Only.Once { // if len(args) == 0 { diff --git a/cmd/cmd_info.go b/cmd/cmd_info.go index b1f85444a..7fbb11c0f 100644 --- a/cmd/cmd_info.go +++ b/cmd/cmd_info.go @@ -1,14 +1,14 @@ package cmd import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/spf13/cobra" ) - //goland:noinspection GoNameStartsWithPackageName type CmdInfo CmdDefault diff --git a/cmd/cmd_mqtt.go b/cmd/cmd_mqtt.go index 13e17a32c..4e7aec973 100644 --- a/cmd/cmd_mqtt.go +++ b/cmd/cmd_mqtt.go @@ -1,12 +1,17 @@ package cmd import ( - "GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/mmHa" "errors" "fmt" + "path/filepath" + "regexp" + "strings" + "time" + + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/mmHa" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/MickMake/GoUnify/cmdLog" @@ -14,13 +19,8 @@ import ( "github.com/go-co-op/gocron" "github.com/spf13/cobra" "github.com/spf13/viper" - "path/filepath" - "regexp" - "strings" - "time" ) - const ( DefaultServiceName = "GoSungrow" DefaultServiceArea = "Roof" @@ -31,22 +31,21 @@ const ( flagMqttPort = "mqtt-port" ) - //goland:noinspection GoNameStartsWithPackageName type CmdMqtt struct { CmdDefault // HASSIO MQTT - MqttUsername string + MqttUsername string - MqttPassword string - MqttHost string - MqttPort string + MqttPassword string + MqttHost string + MqttPort string - Client *mmHa.Mqtt - endpoints MqttEndPoints - points getDevicePointAttrs.PointsMap - previous map[string]*api.DataEntries + Client *mmHa.Mqtt + endpoints MqttEndPoints + points getDevicePointAttrs.PointsMap + previous map[string]*api.DataEntries optionLogLevel int optionSleepDelay time.Duration @@ -58,15 +57,15 @@ func NewCmdMqtt() *CmdMqtt { var ret *CmdMqtt for range Only.Once { - ret = &CmdMqtt { - CmdDefault: CmdDefault { + ret = &CmdMqtt{ + CmdDefault: CmdDefault{ Error: nil, cmd: nil, SelfCmd: nil, }, optionLogLevel: LogLevelInfo, - optionSleepDelay: time.Second * 40, // Takes up to 40 seconds for data to come in. + optionSleepDelay: time.Second * 40, // Takes up to 40 seconds for data to come in. optionFetchSchedule: time.Minute * 5, previous: make(map[string]*api.DataEntries, 0), } @@ -105,7 +104,7 @@ func (c *CmdMqtt) AttachCommand(cmd *cobra.Command) *cobra.Command { Long: "One-off sync to a HASSIO broker.", DisableFlagParsing: false, DisableFlagsInUseLine: false, - PreRunE: func(cmd *cobra.Command, args []string) error { + PreRunE: func(cmd *cobra.Command, args []string) error { cmds.Error = cmds.SunGrowArgs(cmd, args) if cmds.Error != nil { return cmds.Error @@ -116,8 +115,8 @@ func (c *CmdMqtt) AttachCommand(cmd *cobra.Command) *cobra.Command { } return nil }, - RunE: cmds.Mqtt.CmdMqttRun, - Args: cobra.RangeArgs(0, 1), + RunE: cmds.Mqtt.CmdMqttRun, + Args: cobra.RangeArgs(0, 1), } cmdMqtt.AddCommand(cmdMqttRun) cmdMqttRun.Example = cmdHelp.PrintExamples(cmdMqttRun, "") @@ -130,7 +129,7 @@ func (c *CmdMqtt) AttachCommand(cmd *cobra.Command) *cobra.Command { Long: "Sync to a HASSIO MQTT broker.", DisableFlagParsing: false, DisableFlagsInUseLine: false, - PreRunE: func(cmd *cobra.Command, args []string) error { + PreRunE: func(cmd *cobra.Command, args []string) error { cmds.Error = cmds.SunGrowArgs(cmd, args) if cmds.Error != nil { return cmds.Error @@ -141,8 +140,8 @@ func (c *CmdMqtt) AttachCommand(cmd *cobra.Command) *cobra.Command { } return nil }, - RunE: cmds.Mqtt.CmdMqttSync, - Args: cobra.RangeArgs(0, 1), + RunE: cmds.Mqtt.CmdMqttSync, + Args: cobra.RangeArgs(0, 1), } cmdMqtt.AddCommand(cmdMqttSync) cmdMqttSync.Example = cmdHelp.PrintExamples(cmdMqttSync, "", "all") @@ -166,7 +165,7 @@ func (c *CmdMqtt) AttachFlags(cmd *cobra.Command, viper *viper.Viper) { func (c *CmdMqtt) MqttArgs(_ *cobra.Command, _ []string) error { for range Only.Once { c.LogInfo("Connecting to MQTT HASSIO Service...\n") - c.Client = mmHa.New(mmHa.Mqtt { + c.Client = mmHa.New(mmHa.Mqtt{ ClientId: DefaultServiceName, EntityPrefix: DefaultServiceName, Username: c.MqttUsername, @@ -330,7 +329,6 @@ func (c *CmdMqtt) CmdMqttSync(_ *cobra.Command, args []string) error { return c.Error } - // -------------------------------------------------------------------------------- // func (c *CmdMqtt) Cron() error { @@ -431,7 +429,7 @@ func (c *CmdMqtt) Update(endpoint string, data api.DataMap, newDay bool) error { } _ = c.UpdatePoint(r) - r.Value.UnitValueFix() // @TODO - Fix this up properly + r.Value.UnitValueFix() // @TODO - Fix this up properly id := r.EndPoint name := r.EndPoint @@ -450,16 +448,16 @@ func (c *CmdMqtt) Update(endpoint string, data api.DataMap, newDay bool) error { // r.Point.Unit = mmHa.LabelBinarySensor // } - re := mmHa.EntityConfig { - Name: name, // mmHa.JoinStringsForName(" - ", id), // r.Point.Name, // PointName, - SubName: "", - ParentId: r.EndPoint, - ParentName: r.Parent.Key, - UniqueId: r.Point.Id, + re := mmHa.EntityConfig{ + Name: name, // mmHa.JoinStringsForName(" - ", id), // r.Point.Name, // PointName, + SubName: "", + ParentId: r.EndPoint, + ParentName: r.Parent.Key, + UniqueId: r.Point.Id, // UniqueId: r.Id, FullId: id, // string(r.FullId), // WAS r.Point.FullId // FullName: r.Point.Name, - Units: r.Point.Unit, + Units: r.Point.Unit, // ValueName: r.Point.Description, // ValueName: r.Point.Id, DeviceClass: "", @@ -535,7 +533,7 @@ func (c *CmdMqtt) GetEndPoints() error { for name := range c.endpoints { _, c.Error = c.Client.SetDeviceConfig( DefaultServiceName, DefaultServiceName, - name, DefaultServiceName + "." + name, DefaultServiceName, DefaultVendor, + name, DefaultServiceName+"."+name, DefaultServiceName, DefaultVendor, DefaultServiceArea, ) if c.Error != nil { @@ -795,7 +793,6 @@ func (c *CmdMqtt) UpdatePoint(entry *api.DataEntry) error { // } // } - // -------------------------------------------------------------------------------- // const ( @@ -829,41 +826,41 @@ func (c *CmdMqtt) SetLogLevel(level string) { func (c *CmdMqtt) GetLogLevel() string { var ret string switch c.optionLogLevel { - case LogLevelDebug: - ret = LogLevelDebugStr - case LogLevelInfo: - ret = LogLevelInfoStr - case LogLevelWarning: - ret = LogLevelWarningStr - case LogLevelError: - ret = LogLevelErrorStr - default: - ret = LogLevelInfoStr + case LogLevelDebug: + ret = LogLevelDebugStr + case LogLevelInfo: + ret = LogLevelInfoStr + case LogLevelWarning: + ret = LogLevelWarningStr + case LogLevelError: + ret = LogLevelErrorStr + default: + ret = LogLevelInfoStr } return ret } func (c *CmdMqtt) LogDebug(format string, args ...interface{}) { if LogLevelDebug >= c.optionLogLevel { - cmdLog.LogPrintDate("DEBUG: " + format, args...) + cmdLog.LogPrintDate("DEBUG: "+format, args...) } } func (c *CmdMqtt) LogInfo(format string, args ...interface{}) { if LogLevelInfo >= c.optionLogLevel { - cmdLog.LogPrintDate("INFO: " + format, args...) + cmdLog.LogPrintDate("INFO: "+format, args...) } } func (c *CmdMqtt) LogWarning(format string, args ...interface{}) { if LogLevelWarning >= c.optionLogLevel { - cmdLog.LogPrintDate("WARNING: " + format, args...) + cmdLog.LogPrintDate("WARNING: "+format, args...) } } func (c *CmdMqtt) LogError(format string, args ...interface{}) { if LogLevelError >= c.optionLogLevel { - cmdLog.LogPrintDate("ERROR: " + format, args...) + cmdLog.LogPrintDate("ERROR: "+format, args...) } } @@ -891,7 +888,6 @@ func (c *CmdMqtt) LogPlainError(format string, args ...interface{}) { } } - const ( OptionLogLevel = "loglevel" OptionFetchSchedule = "fetchschedule" @@ -948,7 +944,6 @@ func (c *CmdMqtt) Options() error { return c.Error } - func (c *CmdMqtt) optionFuncLogLevel(_ mqtt.Client, msg mqtt.Message) { for range Only.Once { request := strings.ToLower(string(msg.Payload())) @@ -1013,9 +1008,9 @@ func (c *CmdMqtt) optionFuncServiceState(_ mqtt.Client, msg mqtt.Message) { request := strings.ToLower(string(msg.Payload())) c.LogInfo("Option[%s] set to '%s'\n", OptionServiceState, request) switch request { - case "Run": - case "Restart": - case "Stop": + case "Run": + case "Restart": + case "Stop": } c.Error = c.Client.SetOptionValue(OptionServiceState, request) @@ -1026,7 +1021,6 @@ func (c *CmdMqtt) optionFuncServiceState(_ mqtt.Client, msg mqtt.Message) { } } - // -------------------------------------------------------------------------------- // type MqttEndPoints map[string]MqttEndPoint @@ -1034,6 +1028,7 @@ type MqttEndPoint struct { Include []string `json:"include"` Exclude []string `json:"exclude"` } + func (c *MqttEndPoints) Names() []string { var ret []string for name := range *c { diff --git a/cmd/cmd_show_meta.go b/cmd/cmd_show_meta.go index acd287de3..67235f403 100644 --- a/cmd/cmd_show_meta.go +++ b/cmd/cmd_show_meta.go @@ -1,14 +1,14 @@ package cmd import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/spf13/cobra" ) - func (c *CmdShow) AttachMeta(cmd *cobra.Command) *cobra.Command { for range Only.Once { var self = &cobra.Command{ @@ -35,7 +35,6 @@ func (c *CmdShow) AttachMeta(cmd *cobra.Command) *cobra.Command { return c.SelfCmd } - func (c *CmdShow) AttachMetaUnitList(cmd *cobra.Command) *cobra.Command { var self = &cobra.Command{ Use: "unit-list", diff --git a/cmd/cmd_show_psid.go b/cmd/cmd_show_psid.go index 4efb4f58c..b79b2f03d 100644 --- a/cmd/cmd_show_psid.go +++ b/cmd/cmd_show_psid.go @@ -1,17 +1,17 @@ package cmd import ( - "GoSungrow/iSolarCloud" - "GoSungrow/iSolarCloud/AppService/getPsDetail" - "GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" "fmt" + "strings" + + "github.com/MickMake/GoSungrow/iSolarCloud" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/cmdHelp" "github.com/spf13/cobra" - "strings" ) - func (c *CmdShow) AttachPs(cmd *cobra.Command) *cobra.Command { for range Only.Once { var self = &cobra.Command{ @@ -41,7 +41,6 @@ func (c *CmdShow) AttachPs(cmd *cobra.Command) *cobra.Command { return c.SelfCmd } - func (c *CmdShow) AttachPsList(cmd *cobra.Command) *cobra.Command { var self = &cobra.Command{ Use: "list", diff --git a/cmd/commands.go b/cmd/commands.go index 535937ca1..5662a122b 100644 --- a/cmd/commands.go +++ b/cmd/commands.go @@ -1,21 +1,20 @@ package cmd import ( - "GoSungrow/defaults" + "github.com/MickMake/GoSungrow/defaults" "github.com/MickMake/GoUnify/Only" "github.com/MickMake/GoUnify/Unify" "github.com/spf13/cobra" ) - type Cmds struct { - Unify *Unify.Unify - Api *CmdApi - Data *CmdData - Info *CmdInfo - Show *CmdShow - Mqtt *CmdMqtt - Ha *CmdHa + Unify *Unify.Unify + Api *CmdApi + Data *CmdData + Info *CmdInfo + Show *CmdShow + Mqtt *CmdMqtt + Ha *CmdHa ConfigDir string CacheDir string @@ -36,14 +35,12 @@ type CmdDefault struct { SelfCmd *cobra.Command } - var cmds Cmds - func init() { for range Only.Once { cmds.Unify = Unify.New( - Unify.Options { + Unify.Options{ Description: defaults.Description, BinaryName: defaults.BinaryName, BinaryVersion: defaults.BinaryVersion, @@ -96,7 +93,6 @@ func Execute() error { return err } - func (ca *Cmds) ProcessArgs(_ *cobra.Command, args []string) error { for range Only.Once { ca.Args = args diff --git a/example/example.go b/example/example.go index f4a247bd8..ad457b71d 100644 --- a/example/example.go +++ b/example/example.go @@ -1,19 +1,19 @@ package example import ( - "GoSungrow/iSolarCloud" - "GoSungrow/iSolarCloud/AppService/login" - "GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" - "github.com/MickMake/GoUnify/Only" "log" "os" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/login" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) // Example1 - GoSungrow API example func Example1(startDate string, endDate string, interval string, points []string) error { @@ -39,7 +39,7 @@ func Example1(startDate string, endDate string, interval string, points []string break } - auth := login.SunGrowAuth { + auth := login.SunGrowAuth{ AppKey: appKey, UserAccount: user, UserPassword: password, @@ -51,7 +51,6 @@ func Example1(startDate string, endDate string, interval string, points []string break } - // -------------------------------------------------------------------------------- // // Produce output. data := sg.NewSunGrowData() @@ -61,10 +60,10 @@ func Example1(startDate string, endDate string, interval string, points []string fmt.Printf("Points: %s\n", strings.Join(points, ",")) data.SetArgs( - "StartTimeStamp:" + startDate, - "EndTimeStamp:" + endDate, - "MinuteInterval:" + interval, - "Points:" + strings.Join(points, ","), + "StartTimeStamp:"+startDate, + "EndTimeStamp:"+endDate, + "MinuteInterval:"+interval, + "Points:"+strings.Join(points, ","), ) data.SetEndpoints(queryMutiPointDataList.EndPointName) @@ -123,7 +122,6 @@ func Example2(startDate string, endDate string, interval string, points []string } ed.SetDateType(valueTypes.DateTimeLayoutSecond) - // -------------------------------------------------------------------------------- // // Initial setup. url := "https://augateway.isolarcloud.com" @@ -143,7 +141,7 @@ func Example2(startDate string, endDate string, interval string, points []string break } - auth := login.SunGrowAuth { + auth := login.SunGrowAuth{ AppKey: appKey, UserAccount: user, UserPassword: password, @@ -155,20 +153,19 @@ func Example2(startDate string, endDate string, interval string, points []string break } - // -------------------------------------------------------------------------------- // // Produce output. ep := sg.GetByStruct( "AppService.queryMutiPointDataList", - queryMutiPointDataList.RequestData { - PsId: psId, + queryMutiPointDataList.RequestData{ + PsId: psId, StartTimeStamp: sd, - EndTimeStamp: ed, + EndTimeStamp: ed, MinuteInterval: i, - PsKeys: *p.PsKeys(), - Points: p, + PsKeys: *p.PsKeys(), + Points: p, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -191,9 +188,9 @@ func Example2(startDate string, endDate string, interval string, points []string break } - response.Options = iSolarCloud.OutputOptions { - OutputType: output.TypeTable, - SaveAsFile: false, + response.Options = iSolarCloud.OutputOptions{ + OutputType: output.TypeTable, + SaveAsFile: false, GraphRequest: output.GraphRequest{}, } @@ -242,7 +239,6 @@ func Example3(startDate valueTypes.DateTime, endDate valueTypes.DateTime, interv interval.SetValue(5) } - // -------------------------------------------------------------------------------- // // Initial setup. url := "https://augateway.isolarcloud.com" @@ -262,7 +258,7 @@ func Example3(startDate valueTypes.DateTime, endDate valueTypes.DateTime, interv break } - auth := login.SunGrowAuth { + auth := login.SunGrowAuth{ AppKey: appKey, UserAccount: user, UserPassword: password, @@ -274,20 +270,19 @@ func Example3(startDate valueTypes.DateTime, endDate valueTypes.DateTime, interv break } - // -------------------------------------------------------------------------------- // // Produce output. ep := sg.GetByStruct( "AppService.queryMutiPointDataList", - queryMutiPointDataList.RequestData { - PsId: psId, + queryMutiPointDataList.RequestData{ + PsId: psId, StartTimeStamp: startDate, - EndTimeStamp: endDate, + EndTimeStamp: endDate, MinuteInterval: interval, - PsKeys: *points.PsKeys(), - Points: points, + PsKeys: *points.PsKeys(), + Points: points, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -302,9 +297,9 @@ func Example3(startDate valueTypes.DateTime, endDate valueTypes.DateTime, interv break } - response.Options = iSolarCloud.OutputOptions { - OutputType: output.TypeGraph, - SaveAsFile: false, + response.Options = iSolarCloud.OutputOptions{ + OutputType: output.TypeGraph, + SaveAsFile: false, GraphRequest: output.GraphRequest{}, } @@ -317,7 +312,6 @@ func Example3(startDate valueTypes.DateTime, endDate valueTypes.DateTime, interv return err } - func main() { var err error @@ -326,21 +320,18 @@ func main() { interval := "5" points := []string{"Points:1171348_43_2_2.p58603", "1171348_43_2_2.p58604", "1171348_43_2_2.p58605", "1171348_43_2_2.p58606"} - err = Example1(startDate, endDate, interval, points) if err != nil { log.Fatalf("Error: %s", err) os.Exit(1) } - err = Example2(startDate, endDate, interval, points) if err != nil { log.Fatalf("Error: %s", err) os.Exit(1) } - err = Example3(valueTypes.SetDateTimeString(startDate), valueTypes.SetDateTimeString(endDate), valueTypes.SetIntegerString(interval), valueTypes.SetPointIdsString(points...)) if err != nil { diff --git a/go.mod b/go.mod index 8e2b2badb..d81b75e82 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module GoSungrow +module github.com/MickMake/GoSungrow go 1.19 diff --git a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go index 1bfb046d8..fa584ecd6 100644 --- a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go +++ b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go @@ -1,10 +1,11 @@ package msgDownwardStatusReceipt import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go index ae19dab10..ee65d8f9e 100644 --- a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go +++ b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go @@ -5,9 +5,9 @@ package msgDownwardStatusReceipt import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AliSmsService/struct.go b/iSolarCloud/AliSmsService/struct.go index 1f3b2b7f6..253def1a9 100644 --- a/iSolarCloud/AliSmsService/struct.go +++ b/iSolarCloud/AliSmsService/struct.go @@ -3,12 +3,12 @@ package AliSmsService import ( - "GoSungrow/iSolarCloud/AliSmsService/msgDownwardStatusReceipt" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AliSmsService/msgDownwardStatusReceipt" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" +) var _ api.Area = (*Area)(nil) diff --git a/iSolarCloud/AppService/acceptPsSharing/data.go b/iSolarCloud/AppService/acceptPsSharing/data.go index 38ecf2e06..b7a4140e4 100644 --- a/iSolarCloud/AppService/acceptPsSharing/data.go +++ b/iSolarCloud/AppService/acceptPsSharing/data.go @@ -1,11 +1,12 @@ package acceptPsSharing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/acceptPsSharing" diff --git a/iSolarCloud/AppService/acceptPsSharing/struct.go b/iSolarCloud/AppService/acceptPsSharing/struct.go index d67acde12..0643f39aa 100644 --- a/iSolarCloud/AppService/acceptPsSharing/struct.go +++ b/iSolarCloud/AppService/acceptPsSharing/struct.go @@ -5,9 +5,9 @@ package acceptPsSharing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/activateEmail/data.go b/iSolarCloud/AppService/activateEmail/data.go index 647b79171..84b307aaa 100644 --- a/iSolarCloud/AppService/activateEmail/data.go +++ b/iSolarCloud/AppService/activateEmail/data.go @@ -1,11 +1,12 @@ package activateEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/activateEmail" diff --git a/iSolarCloud/AppService/activateEmail/struct.go b/iSolarCloud/AppService/activateEmail/struct.go index 7396e6df1..81e911b34 100644 --- a/iSolarCloud/AppService/activateEmail/struct.go +++ b/iSolarCloud/AppService/activateEmail/struct.go @@ -5,9 +5,9 @@ package activateEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addConfig/data.go b/iSolarCloud/AppService/addConfig/data.go index 1e353560f..b3fd52288 100644 --- a/iSolarCloud/AppService/addConfig/data.go +++ b/iSolarCloud/AppService/addConfig/data.go @@ -1,11 +1,12 @@ package addConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/addConfig" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addConfig/struct.go b/iSolarCloud/AppService/addConfig/struct.go index 7c5e4b2a7..4617fcef5 100644 --- a/iSolarCloud/AppService/addConfig/struct.go +++ b/iSolarCloud/AppService/addConfig/struct.go @@ -5,9 +5,9 @@ package addConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addDeviceRepair/data.go b/iSolarCloud/AppService/addDeviceRepair/data.go index f4488f734..14b64f851 100644 --- a/iSolarCloud/AppService/addDeviceRepair/data.go +++ b/iSolarCloud/AppService/addDeviceRepair/data.go @@ -1,11 +1,12 @@ package addDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/addDeviceRepair" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addDeviceRepair/struct.go b/iSolarCloud/AppService/addDeviceRepair/struct.go index 1119d67be..8fb8edac3 100644 --- a/iSolarCloud/AppService/addDeviceRepair/struct.go +++ b/iSolarCloud/AppService/addDeviceRepair/struct.go @@ -5,9 +5,9 @@ package addDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go b/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go index 7a3fc3ebd..2b4e952ee 100644 --- a/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go +++ b/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go @@ -1,11 +1,12 @@ package addDeviceToStructureForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/addDeviceToStructureForHousehold" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go b/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go index decc5ba5f..d7fd9936d 100644 --- a/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go +++ b/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go @@ -5,9 +5,9 @@ package addDeviceToStructureForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go index ce38725cb..761e8e938 100644 --- a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go +++ b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go @@ -1,10 +1,11 @@ package addDeviceToStructureForHouseholdByPsIdS import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go index 8ea5b5d8e..8fc2315c8 100644 --- a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go +++ b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go @@ -5,9 +5,9 @@ package addDeviceToStructureForHouseholdByPsIdS import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addFault/data.go b/iSolarCloud/AppService/addFault/data.go index 34fb607c4..cfb90175f 100644 --- a/iSolarCloud/AppService/addFault/data.go +++ b/iSolarCloud/AppService/addFault/data.go @@ -1,11 +1,12 @@ package addFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addFault" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addFault/struct.go b/iSolarCloud/AppService/addFault/struct.go index 9de63c08d..e409d9334 100644 --- a/iSolarCloud/AppService/addFault/struct.go +++ b/iSolarCloud/AppService/addFault/struct.go @@ -5,9 +5,9 @@ package addFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addFaultOrder/data.go b/iSolarCloud/AppService/addFaultOrder/data.go index 326a56317..ce7f29938 100644 --- a/iSolarCloud/AppService/addFaultOrder/data.go +++ b/iSolarCloud/AppService/addFaultOrder/data.go @@ -1,11 +1,12 @@ package addFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addFaultOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addFaultOrder/struct.go b/iSolarCloud/AppService/addFaultOrder/struct.go index c9da34b1d..153b45a32 100644 --- a/iSolarCloud/AppService/addFaultOrder/struct.go +++ b/iSolarCloud/AppService/addFaultOrder/struct.go @@ -5,9 +5,9 @@ package addFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addFaultPlan/data.go b/iSolarCloud/AppService/addFaultPlan/data.go index 3c19ea032..017696028 100644 --- a/iSolarCloud/AppService/addFaultPlan/data.go +++ b/iSolarCloud/AppService/addFaultPlan/data.go @@ -1,11 +1,12 @@ package addFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addFaultPlan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addFaultPlan/struct.go b/iSolarCloud/AppService/addFaultPlan/struct.go index 9defee8ef..827a70e67 100644 --- a/iSolarCloud/AppService/addFaultPlan/struct.go +++ b/iSolarCloud/AppService/addFaultPlan/struct.go @@ -5,9 +5,9 @@ package addFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addFaultRepairSteps/data.go b/iSolarCloud/AppService/addFaultRepairSteps/data.go index 70f5e95fb..6380dbd5c 100644 --- a/iSolarCloud/AppService/addFaultRepairSteps/data.go +++ b/iSolarCloud/AppService/addFaultRepairSteps/data.go @@ -1,11 +1,12 @@ package addFaultRepairSteps import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addFaultRepairSteps" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addFaultRepairSteps/struct.go b/iSolarCloud/AppService/addFaultRepairSteps/struct.go index 06c8bfa14..e47e94ba6 100644 --- a/iSolarCloud/AppService/addFaultRepairSteps/struct.go +++ b/iSolarCloud/AppService/addFaultRepairSteps/struct.go @@ -5,9 +5,9 @@ package addFaultRepairSteps import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addHouseholdEvaluation/data.go b/iSolarCloud/AppService/addHouseholdEvaluation/data.go index 76340bf30..668ab8588 100644 --- a/iSolarCloud/AppService/addHouseholdEvaluation/data.go +++ b/iSolarCloud/AppService/addHouseholdEvaluation/data.go @@ -1,11 +1,12 @@ package addHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addHouseholdEvaluation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addHouseholdEvaluation/struct.go b/iSolarCloud/AppService/addHouseholdEvaluation/struct.go index e060b6528..16b0584a6 100644 --- a/iSolarCloud/AppService/addHouseholdEvaluation/struct.go +++ b/iSolarCloud/AppService/addHouseholdEvaluation/struct.go @@ -5,9 +5,9 @@ package addHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go index d5622bdac..4e05d5cda 100644 --- a/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go +++ b/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go @@ -1,11 +1,12 @@ package addHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addHouseholdLeaveMessage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go index fddb1019e..b513dde9b 100644 --- a/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go +++ b/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go @@ -5,9 +5,9 @@ package addHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go b/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go index a7caf241d..12f496c50 100644 --- a/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go +++ b/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go @@ -1,11 +1,12 @@ package addHouseholdOpinionFeedback import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addHouseholdOpinionFeedback" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go b/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go index 83bffaac0..e9356e721 100644 --- a/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go +++ b/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go @@ -5,9 +5,9 @@ package addHouseholdOpinionFeedback import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addHouseholdWorkOrder/data.go b/iSolarCloud/AppService/addHouseholdWorkOrder/data.go index 6e36aa1e3..68b4191b1 100644 --- a/iSolarCloud/AppService/addHouseholdWorkOrder/data.go +++ b/iSolarCloud/AppService/addHouseholdWorkOrder/data.go @@ -1,11 +1,12 @@ package addHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addHouseholdWorkOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go index e236fb562..5023f2fed 100644 --- a/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go +++ b/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go @@ -5,9 +5,9 @@ package addHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addOnDutyInfo/data.go b/iSolarCloud/AppService/addOnDutyInfo/data.go index ee72c0df8..5e600b137 100644 --- a/iSolarCloud/AppService/addOnDutyInfo/data.go +++ b/iSolarCloud/AppService/addOnDutyInfo/data.go @@ -1,11 +1,12 @@ package addOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/addOnDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addOnDutyInfo/struct.go b/iSolarCloud/AppService/addOnDutyInfo/struct.go index c1c920d9b..249ad4b2b 100644 --- a/iSolarCloud/AppService/addOnDutyInfo/struct.go +++ b/iSolarCloud/AppService/addOnDutyInfo/struct.go @@ -5,9 +5,9 @@ package addOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addOperRule/data.go b/iSolarCloud/AppService/addOperRule/data.go index 1bce7eb5a..e7271b498 100644 --- a/iSolarCloud/AppService/addOperRule/data.go +++ b/iSolarCloud/AppService/addOperRule/data.go @@ -1,11 +1,12 @@ package addOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addOperRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addOperRule/struct.go b/iSolarCloud/AppService/addOperRule/struct.go index 666e7c9ce..14bbd3daf 100644 --- a/iSolarCloud/AppService/addOperRule/struct.go +++ b/iSolarCloud/AppService/addOperRule/struct.go @@ -5,9 +5,9 @@ package addOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addOrDelPsStructure/data.go b/iSolarCloud/AppService/addOrDelPsStructure/data.go index 7470f3cba..b53516a09 100644 --- a/iSolarCloud/AppService/addOrDelPsStructure/data.go +++ b/iSolarCloud/AppService/addOrDelPsStructure/data.go @@ -1,11 +1,12 @@ package addOrDelPsStructure import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/addOrDelPsStructure" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addOrDelPsStructure/struct.go b/iSolarCloud/AppService/addOrDelPsStructure/struct.go index 99c5648e7..b9abcb829 100644 --- a/iSolarCloud/AppService/addOrDelPsStructure/struct.go +++ b/iSolarCloud/AppService/addOrDelPsStructure/struct.go @@ -5,9 +5,9 @@ package addOrDelPsStructure import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addOrderStep/data.go b/iSolarCloud/AppService/addOrderStep/data.go index 1e88cb2f3..ace9d8f83 100644 --- a/iSolarCloud/AppService/addOrderStep/data.go +++ b/iSolarCloud/AppService/addOrderStep/data.go @@ -1,11 +1,12 @@ package addOrderStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addOrderStep" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addOrderStep/struct.go b/iSolarCloud/AppService/addOrderStep/struct.go index 354ce3c6b..9125e34dd 100644 --- a/iSolarCloud/AppService/addOrderStep/struct.go +++ b/iSolarCloud/AppService/addOrderStep/struct.go @@ -5,9 +5,9 @@ package addOrderStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addPowerStationForHousehold/data.go b/iSolarCloud/AppService/addPowerStationForHousehold/data.go index a7035084b..e55a4300b 100644 --- a/iSolarCloud/AppService/addPowerStationForHousehold/data.go +++ b/iSolarCloud/AppService/addPowerStationForHousehold/data.go @@ -1,11 +1,12 @@ package addPowerStationForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/addPowerStationForHousehold" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addPowerStationForHousehold/struct.go b/iSolarCloud/AppService/addPowerStationForHousehold/struct.go index cf5cc4a82..91d8c4575 100644 --- a/iSolarCloud/AppService/addPowerStationForHousehold/struct.go +++ b/iSolarCloud/AppService/addPowerStationForHousehold/struct.go @@ -5,9 +5,9 @@ package addPowerStationForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addPowerStationInfo/data.go b/iSolarCloud/AppService/addPowerStationInfo/data.go index ea2e49634..b00663313 100644 --- a/iSolarCloud/AppService/addPowerStationInfo/data.go +++ b/iSolarCloud/AppService/addPowerStationInfo/data.go @@ -1,11 +1,12 @@ package addPowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/addPowerStationInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addPowerStationInfo/struct.go b/iSolarCloud/AppService/addPowerStationInfo/struct.go index f0c90c1d3..3cb6769b2 100644 --- a/iSolarCloud/AppService/addPowerStationInfo/struct.go +++ b/iSolarCloud/AppService/addPowerStationInfo/struct.go @@ -5,9 +5,9 @@ package addPowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addReportConfigEmail/data.go b/iSolarCloud/AppService/addReportConfigEmail/data.go index c0f91b468..a7fd929ea 100644 --- a/iSolarCloud/AppService/addReportConfigEmail/data.go +++ b/iSolarCloud/AppService/addReportConfigEmail/data.go @@ -1,11 +1,12 @@ package addReportConfigEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/addReportConfigEmail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addReportConfigEmail/struct.go b/iSolarCloud/AppService/addReportConfigEmail/struct.go index 0b11fa54a..e92add2dc 100644 --- a/iSolarCloud/AppService/addReportConfigEmail/struct.go +++ b/iSolarCloud/AppService/addReportConfigEmail/struct.go @@ -5,9 +5,9 @@ package addReportConfigEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addSysAdvancedParam/data.go b/iSolarCloud/AppService/addSysAdvancedParam/data.go index d2b5e1b26..d5057714b 100644 --- a/iSolarCloud/AppService/addSysAdvancedParam/data.go +++ b/iSolarCloud/AppService/addSysAdvancedParam/data.go @@ -1,11 +1,12 @@ package addSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/addSysAdvancedParam" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addSysAdvancedParam/struct.go b/iSolarCloud/AppService/addSysAdvancedParam/struct.go index c07aec31b..1c0e4ff0e 100644 --- a/iSolarCloud/AppService/addSysAdvancedParam/struct.go +++ b/iSolarCloud/AppService/addSysAdvancedParam/struct.go @@ -5,9 +5,9 @@ package addSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/addSysOrgNew/data.go b/iSolarCloud/AppService/addSysOrgNew/data.go index 5fa695aca..2f282bd3e 100644 --- a/iSolarCloud/AppService/addSysOrgNew/data.go +++ b/iSolarCloud/AppService/addSysOrgNew/data.go @@ -1,11 +1,12 @@ package addSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/addSysOrgNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/addSysOrgNew/struct.go b/iSolarCloud/AppService/addSysOrgNew/struct.go index df56ee681..8cd82d465 100644 --- a/iSolarCloud/AppService/addSysOrgNew/struct.go +++ b/iSolarCloud/AppService/addSysOrgNew/struct.go @@ -5,9 +5,9 @@ package addSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/aliPayAppTest/data.go b/iSolarCloud/AppService/aliPayAppTest/data.go index 78396e5a9..c76f435ce 100644 --- a/iSolarCloud/AppService/aliPayAppTest/data.go +++ b/iSolarCloud/AppService/aliPayAppTest/data.go @@ -1,11 +1,12 @@ package aliPayAppTest import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/aliPayAppTest" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/aliPayAppTest/struct.go b/iSolarCloud/AppService/aliPayAppTest/struct.go index d598908b9..660af77c2 100644 --- a/iSolarCloud/AppService/aliPayAppTest/struct.go +++ b/iSolarCloud/AppService/aliPayAppTest/struct.go @@ -5,9 +5,9 @@ package aliPayAppTest import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/auditOperRule/data.go b/iSolarCloud/AppService/auditOperRule/data.go index d6c79802e..d91397e62 100644 --- a/iSolarCloud/AppService/auditOperRule/data.go +++ b/iSolarCloud/AppService/auditOperRule/data.go @@ -1,11 +1,12 @@ package auditOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/auditOperRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/auditOperRule/struct.go b/iSolarCloud/AppService/auditOperRule/struct.go index 8a75a8e7a..7cdbb09d2 100644 --- a/iSolarCloud/AppService/auditOperRule/struct.go +++ b/iSolarCloud/AppService/auditOperRule/struct.go @@ -5,9 +5,9 @@ package auditOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchAddStationBySn/data.go b/iSolarCloud/AppService/batchAddStationBySn/data.go index 8190550d0..93f187420 100644 --- a/iSolarCloud/AppService/batchAddStationBySn/data.go +++ b/iSolarCloud/AppService/batchAddStationBySn/data.go @@ -1,11 +1,12 @@ package batchAddStationBySn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/batchAddStationBySn" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchAddStationBySn/struct.go b/iSolarCloud/AppService/batchAddStationBySn/struct.go index 5f199b0d3..be6112f23 100644 --- a/iSolarCloud/AppService/batchAddStationBySn/struct.go +++ b/iSolarCloud/AppService/batchAddStationBySn/struct.go @@ -5,9 +5,9 @@ package batchAddStationBySn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchImportSN/data.go b/iSolarCloud/AppService/batchImportSN/data.go index 031c4ff56..3a7d94d00 100644 --- a/iSolarCloud/AppService/batchImportSN/data.go +++ b/iSolarCloud/AppService/batchImportSN/data.go @@ -1,11 +1,12 @@ package batchImportSN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchImportSN" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchImportSN/struct.go b/iSolarCloud/AppService/batchImportSN/struct.go index a2e78c696..b8bd07d4d 100644 --- a/iSolarCloud/AppService/batchImportSN/struct.go +++ b/iSolarCloud/AppService/batchImportSN/struct.go @@ -5,9 +5,9 @@ package batchImportSN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchInsertUserAndOrg/data.go b/iSolarCloud/AppService/batchInsertUserAndOrg/data.go index e6e2a067d..b29ae2cc9 100644 --- a/iSolarCloud/AppService/batchInsertUserAndOrg/data.go +++ b/iSolarCloud/AppService/batchInsertUserAndOrg/data.go @@ -1,11 +1,12 @@ package batchInsertUserAndOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/batchInsertUserAndOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go b/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go index 3a32a2cce..08e29f118 100644 --- a/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go +++ b/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go @@ -5,9 +5,9 @@ package batchInsertUserAndOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go index 6f186638a..783398e43 100644 --- a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go +++ b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go @@ -1,11 +1,12 @@ package batchModifyDevicesInfoAndPropertis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchModifyDevicesInfoAndPropertis" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go index 2c51e9b58..1021de1d6 100644 --- a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go +++ b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go @@ -5,9 +5,9 @@ package batchModifyDevicesInfoAndPropertis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchProcessPlantReport/data.go b/iSolarCloud/AppService/batchProcessPlantReport/data.go index 7df468cb1..24400221d 100644 --- a/iSolarCloud/AppService/batchProcessPlantReport/data.go +++ b/iSolarCloud/AppService/batchProcessPlantReport/data.go @@ -1,11 +1,12 @@ package batchProcessPlantReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/batchProcessPlantReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchProcessPlantReport/struct.go b/iSolarCloud/AppService/batchProcessPlantReport/struct.go index 6d7fc1d0f..9aa44cce4 100644 --- a/iSolarCloud/AppService/batchProcessPlantReport/struct.go +++ b/iSolarCloud/AppService/batchProcessPlantReport/struct.go @@ -5,9 +5,9 @@ package batchProcessPlantReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchUpdateDeviceSim/data.go b/iSolarCloud/AppService/batchUpdateDeviceSim/data.go index b9b82c4fd..cdfbb859b 100644 --- a/iSolarCloud/AppService/batchUpdateDeviceSim/data.go +++ b/iSolarCloud/AppService/batchUpdateDeviceSim/data.go @@ -1,11 +1,12 @@ package batchUpdateDeviceSim import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchUpdateDeviceSim" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go b/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go index 06130ec57..6a633e2a8 100644 --- a/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go +++ b/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go @@ -5,9 +5,9 @@ package batchUpdateDeviceSim import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go index 21056fe44..6b8928b5d 100644 --- a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go +++ b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go @@ -1,11 +1,12 @@ package batchUpdateUserIsAgreeGdpr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/batchUpdateUserIsAgreeGdpr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go index d2d5f0cc0..f55e2ff68 100644 --- a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go +++ b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go @@ -5,9 +5,9 @@ package batchUpdateUserIsAgreeGdpr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/boundMobilePhone/data.go b/iSolarCloud/AppService/boundMobilePhone/data.go index bf6c1e184..b76657479 100644 --- a/iSolarCloud/AppService/boundMobilePhone/data.go +++ b/iSolarCloud/AppService/boundMobilePhone/data.go @@ -1,11 +1,12 @@ package boundMobilePhone import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/boundMobilePhone" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/boundMobilePhone/struct.go b/iSolarCloud/AppService/boundMobilePhone/struct.go index dd85431e1..f1815ef74 100644 --- a/iSolarCloud/AppService/boundMobilePhone/struct.go +++ b/iSolarCloud/AppService/boundMobilePhone/struct.go @@ -5,9 +5,9 @@ package boundMobilePhone import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/boundUserMail/data.go b/iSolarCloud/AppService/boundUserMail/data.go index b25fb96d9..ff7319247 100644 --- a/iSolarCloud/AppService/boundUserMail/data.go +++ b/iSolarCloud/AppService/boundUserMail/data.go @@ -1,11 +1,12 @@ package boundUserMail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/boundUserMail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/boundUserMail/struct.go b/iSolarCloud/AppService/boundUserMail/struct.go index 986e8c234..699676947 100644 --- a/iSolarCloud/AppService/boundUserMail/struct.go +++ b/iSolarCloud/AppService/boundUserMail/struct.go @@ -5,9 +5,9 @@ package boundUserMail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go b/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go index 2231bd1b4..238b3460c 100644 --- a/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go +++ b/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go @@ -1,11 +1,12 @@ package caculateDeviceInputDiscrete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/caculateDeviceInputDiscrete" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go b/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go index 546699c26..b2af65b3f 100644 --- a/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go +++ b/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go @@ -5,9 +5,9 @@ package caculateDeviceInputDiscrete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/calculateDeviceDiscrete/data.go b/iSolarCloud/AppService/calculateDeviceDiscrete/data.go index 4d666f167..13f04a38a 100644 --- a/iSolarCloud/AppService/calculateDeviceDiscrete/data.go +++ b/iSolarCloud/AppService/calculateDeviceDiscrete/data.go @@ -1,10 +1,11 @@ package calculateDeviceDiscrete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go b/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go index 60699c93c..58c333702 100644 --- a/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go +++ b/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go @@ -5,9 +5,9 @@ package calculateDeviceDiscrete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/calculateInitialCompensationData/data.go b/iSolarCloud/AppService/calculateInitialCompensationData/data.go index d9fa03c3c..97ed31cb3 100644 --- a/iSolarCloud/AppService/calculateInitialCompensationData/data.go +++ b/iSolarCloud/AppService/calculateInitialCompensationData/data.go @@ -1,11 +1,12 @@ package calculateInitialCompensationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/calculateInitialCompensationData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/calculateInitialCompensationData/struct.go b/iSolarCloud/AppService/calculateInitialCompensationData/struct.go index a04438451..ed63f8550 100644 --- a/iSolarCloud/AppService/calculateInitialCompensationData/struct.go +++ b/iSolarCloud/AppService/calculateInitialCompensationData/struct.go @@ -5,9 +5,9 @@ package calculateInitialCompensationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cancelDeliverMail/data.go b/iSolarCloud/AppService/cancelDeliverMail/data.go index a82ab9c41..044168510 100644 --- a/iSolarCloud/AppService/cancelDeliverMail/data.go +++ b/iSolarCloud/AppService/cancelDeliverMail/data.go @@ -1,11 +1,12 @@ package cancelDeliverMail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/messageService/cancelDeliverMail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cancelDeliverMail/struct.go b/iSolarCloud/AppService/cancelDeliverMail/struct.go index 99235eb76..5a6949fb1 100644 --- a/iSolarCloud/AppService/cancelDeliverMail/struct.go +++ b/iSolarCloud/AppService/cancelDeliverMail/struct.go @@ -5,9 +5,9 @@ package cancelDeliverMail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cancelOrderScan/data.go b/iSolarCloud/AppService/cancelOrderScan/data.go index bfd3b4fcb..6fb41fbc4 100644 --- a/iSolarCloud/AppService/cancelOrderScan/data.go +++ b/iSolarCloud/AppService/cancelOrderScan/data.go @@ -1,11 +1,12 @@ package cancelOrderScan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/cancelOrderScan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cancelOrderScan/struct.go b/iSolarCloud/AppService/cancelOrderScan/struct.go index 5f5d08294..bb4974541 100644 --- a/iSolarCloud/AppService/cancelOrderScan/struct.go +++ b/iSolarCloud/AppService/cancelOrderScan/struct.go @@ -5,9 +5,9 @@ package cancelOrderScan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cancelParamSetTask/data.go b/iSolarCloud/AppService/cancelParamSetTask/data.go index ba8010ac1..bd2b4220f 100644 --- a/iSolarCloud/AppService/cancelParamSetTask/data.go +++ b/iSolarCloud/AppService/cancelParamSetTask/data.go @@ -1,11 +1,12 @@ package cancelParamSetTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/cancelParamSetTask" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cancelParamSetTask/struct.go b/iSolarCloud/AppService/cancelParamSetTask/struct.go index 75fa6514c..29bad92f4 100644 --- a/iSolarCloud/AppService/cancelParamSetTask/struct.go +++ b/iSolarCloud/AppService/cancelParamSetTask/struct.go @@ -5,9 +5,9 @@ package cancelParamSetTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cancelPsSharing/data.go b/iSolarCloud/AppService/cancelPsSharing/data.go index d21298b32..8f635a290 100644 --- a/iSolarCloud/AppService/cancelPsSharing/data.go +++ b/iSolarCloud/AppService/cancelPsSharing/data.go @@ -1,11 +1,12 @@ package cancelPsSharing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/cancelPsSharing" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cancelPsSharing/struct.go b/iSolarCloud/AppService/cancelPsSharing/struct.go index 4238443f2..f77b9099e 100644 --- a/iSolarCloud/AppService/cancelPsSharing/struct.go +++ b/iSolarCloud/AppService/cancelPsSharing/struct.go @@ -5,9 +5,9 @@ package cancelPsSharing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cancelRechargeOrder/data.go b/iSolarCloud/AppService/cancelRechargeOrder/data.go index bf6df13ff..811b11268 100644 --- a/iSolarCloud/AppService/cancelRechargeOrder/data.go +++ b/iSolarCloud/AppService/cancelRechargeOrder/data.go @@ -1,11 +1,12 @@ package cancelRechargeOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/cancelRechargeOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cancelRechargeOrder/struct.go b/iSolarCloud/AppService/cancelRechargeOrder/struct.go index dc67d2afc..2e40818b7 100644 --- a/iSolarCloud/AppService/cancelRechargeOrder/struct.go +++ b/iSolarCloud/AppService/cancelRechargeOrder/struct.go @@ -5,9 +5,9 @@ package cancelRechargeOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/changRechargeOrderToCancel/data.go b/iSolarCloud/AppService/changRechargeOrderToCancel/data.go index fdbf69287..d039ef42a 100644 --- a/iSolarCloud/AppService/changRechargeOrderToCancel/data.go +++ b/iSolarCloud/AppService/changRechargeOrderToCancel/data.go @@ -1,11 +1,12 @@ package changRechargeOrderToCancel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/changRechargeOrderToCancel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go b/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go index 6a801b7d9..a8aa0d303 100644 --- a/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go +++ b/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go @@ -5,9 +5,9 @@ package changRechargeOrderToCancel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go b/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go index e60aefba3..e91c52985 100644 --- a/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go +++ b/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go @@ -1,11 +1,12 @@ package changeHouseholdUser2Installer import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/changeHouseholdUser2Installer" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go b/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go index b56821685..4044b7169 100644 --- a/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go +++ b/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go @@ -5,9 +5,9 @@ package changeHouseholdUser2Installer import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/changeRemoteParam/data.go b/iSolarCloud/AppService/changeRemoteParam/data.go index abc097080..0e21d110e 100644 --- a/iSolarCloud/AppService/changeRemoteParam/data.go +++ b/iSolarCloud/AppService/changeRemoteParam/data.go @@ -1,10 +1,11 @@ package changeRemoteParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } @@ -34,7 +34,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/changeRemoteParam/struct.go b/iSolarCloud/AppService/changeRemoteParam/struct.go index 55dd2dec4..aa933214d 100644 --- a/iSolarCloud/AppService/changeRemoteParam/struct.go +++ b/iSolarCloud/AppService/changeRemoteParam/struct.go @@ -5,9 +5,9 @@ package changeRemoteParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkDealerOrgCode/data.go b/iSolarCloud/AppService/checkDealerOrgCode/data.go index 1bacab74a..933c489ff 100644 --- a/iSolarCloud/AppService/checkDealerOrgCode/data.go +++ b/iSolarCloud/AppService/checkDealerOrgCode/data.go @@ -1,11 +1,12 @@ package checkDealerOrgCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/checkDealerOrgCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkDealerOrgCode/struct.go b/iSolarCloud/AppService/checkDealerOrgCode/struct.go index 0e5ef8845..ef4a993b5 100644 --- a/iSolarCloud/AppService/checkDealerOrgCode/struct.go +++ b/iSolarCloud/AppService/checkDealerOrgCode/struct.go @@ -5,9 +5,9 @@ package checkDealerOrgCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go index a3187da08..bb2e3d894 100644 --- a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go +++ b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go @@ -1,11 +1,12 @@ package checkDevSnIsBelongsToUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkDevSnIsBelongsToUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go index 3d8982982..6e344d7ae 100644 --- a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go +++ b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go @@ -5,9 +5,9 @@ package checkDevSnIsBelongsToUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkInverterResult/data.go b/iSolarCloud/AppService/checkInverterResult/data.go index af9788b4a..2699c9f03 100644 --- a/iSolarCloud/AppService/checkInverterResult/data.go +++ b/iSolarCloud/AppService/checkInverterResult/data.go @@ -1,11 +1,12 @@ package checkInverterResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/checkInverterResult" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkInverterResult/struct.go b/iSolarCloud/AppService/checkInverterResult/struct.go index fa9f67cd2..050bf3569 100644 --- a/iSolarCloud/AppService/checkInverterResult/struct.go +++ b/iSolarCloud/AppService/checkInverterResult/struct.go @@ -5,9 +5,9 @@ package checkInverterResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkIsCanDoParamSet/data.go b/iSolarCloud/AppService/checkIsCanDoParamSet/data.go index 4dc16d3c9..516a74025 100644 --- a/iSolarCloud/AppService/checkIsCanDoParamSet/data.go +++ b/iSolarCloud/AppService/checkIsCanDoParamSet/data.go @@ -1,11 +1,12 @@ package checkIsCanDoParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/checkIsCanDoParamSet" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go b/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go index 576402343..7be296476 100644 --- a/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go +++ b/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go @@ -5,9 +5,9 @@ package checkIsCanDoParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkIsIvScan/data.go b/iSolarCloud/AppService/checkIsIvScan/data.go index 7719f47c1..5152c05ca 100644 --- a/iSolarCloud/AppService/checkIsIvScan/data.go +++ b/iSolarCloud/AppService/checkIsIvScan/data.go @@ -1,11 +1,12 @@ package checkIsIvScan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/checkIsIvScan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkIsIvScan/struct.go b/iSolarCloud/AppService/checkIsIvScan/struct.go index 76cf75d58..94eb8be65 100644 --- a/iSolarCloud/AppService/checkIsIvScan/struct.go +++ b/iSolarCloud/AppService/checkIsIvScan/struct.go @@ -5,9 +5,9 @@ package checkIsIvScan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkOssObjectExist/data.go b/iSolarCloud/AppService/checkOssObjectExist/data.go index bcd2db746..b49228f44 100644 --- a/iSolarCloud/AppService/checkOssObjectExist/data.go +++ b/iSolarCloud/AppService/checkOssObjectExist/data.go @@ -1,11 +1,12 @@ package checkOssObjectExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/checkOssObjectExist" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkOssObjectExist/struct.go b/iSolarCloud/AppService/checkOssObjectExist/struct.go index 9b481fc30..be0ce8c58 100644 --- a/iSolarCloud/AppService/checkOssObjectExist/struct.go +++ b/iSolarCloud/AppService/checkOssObjectExist/struct.go @@ -5,9 +5,9 @@ package checkOssObjectExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkServiceIsConnect/data.go b/iSolarCloud/AppService/checkServiceIsConnect/data.go index 1f4b2c02c..d2f7189aa 100644 --- a/iSolarCloud/AppService/checkServiceIsConnect/data.go +++ b/iSolarCloud/AppService/checkServiceIsConnect/data.go @@ -1,11 +1,12 @@ package checkServiceIsConnect import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/checkServiceIsConnect" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkServiceIsConnect/struct.go b/iSolarCloud/AppService/checkServiceIsConnect/struct.go index a2d0fce1f..45939177d 100644 --- a/iSolarCloud/AppService/checkServiceIsConnect/struct.go +++ b/iSolarCloud/AppService/checkServiceIsConnect/struct.go @@ -5,9 +5,9 @@ package checkServiceIsConnect import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkTechnicalParameters/data.go b/iSolarCloud/AppService/checkTechnicalParameters/data.go index d4b492fb8..f8d6a9423 100644 --- a/iSolarCloud/AppService/checkTechnicalParameters/data.go +++ b/iSolarCloud/AppService/checkTechnicalParameters/data.go @@ -1,11 +1,12 @@ package checkTechnicalParameters import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/checkTechnicalParameters" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkTechnicalParameters/struct.go b/iSolarCloud/AppService/checkTechnicalParameters/struct.go index 7f114fc11..8708a87d2 100644 --- a/iSolarCloud/AppService/checkTechnicalParameters/struct.go +++ b/iSolarCloud/AppService/checkTechnicalParameters/struct.go @@ -5,9 +5,9 @@ package checkTechnicalParameters import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUnitStatus/data.go b/iSolarCloud/AppService/checkUnitStatus/data.go index 44930f264..c544555f0 100644 --- a/iSolarCloud/AppService/checkUnitStatus/data.go +++ b/iSolarCloud/AppService/checkUnitStatus/data.go @@ -1,11 +1,12 @@ package checkUnitStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/checkUnitStatus" diff --git a/iSolarCloud/AppService/checkUnitStatus/struct.go b/iSolarCloud/AppService/checkUnitStatus/struct.go index f8d60dc5f..50b2c6a04 100644 --- a/iSolarCloud/AppService/checkUnitStatus/struct.go +++ b/iSolarCloud/AppService/checkUnitStatus/struct.go @@ -5,9 +5,9 @@ package checkUnitStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go b/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go index 8a82a767d..5eb794881 100644 --- a/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go +++ b/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go @@ -1,11 +1,12 @@ package checkUpRechargeDevicePaying import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/checkUpRechargeDevicePaying" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go b/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go index 708f12b75..b40a3740f 100644 --- a/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go +++ b/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go @@ -5,9 +5,9 @@ package checkUpRechargeDevicePaying import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserAccountUnique/data.go b/iSolarCloud/AppService/checkUserAccountUnique/data.go index 2cc95c387..4e6b3fcc0 100644 --- a/iSolarCloud/AppService/checkUserAccountUnique/data.go +++ b/iSolarCloud/AppService/checkUserAccountUnique/data.go @@ -1,11 +1,12 @@ package checkUserAccountUnique import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserAccountUnique" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserAccountUnique/struct.go b/iSolarCloud/AppService/checkUserAccountUnique/struct.go index bed2c5701..07beae9da 100644 --- a/iSolarCloud/AppService/checkUserAccountUnique/struct.go +++ b/iSolarCloud/AppService/checkUserAccountUnique/struct.go @@ -5,9 +5,9 @@ package checkUserAccountUnique import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go b/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go index 178a810e9..d4f17722a 100644 --- a/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go +++ b/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go @@ -1,11 +1,12 @@ package checkUserAccountUniqueAll import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserAccountUniqueAll" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go b/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go index 0540e3fd1..6eb5c05bd 100644 --- a/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go +++ b/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go @@ -5,9 +5,9 @@ package checkUserAccountUniqueAll import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserInfoUnique/data.go b/iSolarCloud/AppService/checkUserInfoUnique/data.go index 080ae8041..ef19f1755 100644 --- a/iSolarCloud/AppService/checkUserInfoUnique/data.go +++ b/iSolarCloud/AppService/checkUserInfoUnique/data.go @@ -1,11 +1,12 @@ package checkUserInfoUnique import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserInfoUnique" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserInfoUnique/struct.go b/iSolarCloud/AppService/checkUserInfoUnique/struct.go index 7ee1c89d1..1be044c2e 100644 --- a/iSolarCloud/AppService/checkUserInfoUnique/struct.go +++ b/iSolarCloud/AppService/checkUserInfoUnique/struct.go @@ -5,9 +5,9 @@ package checkUserInfoUnique import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserIsExist/data.go b/iSolarCloud/AppService/checkUserIsExist/data.go index 2da947e5f..ef98c6ccf 100644 --- a/iSolarCloud/AppService/checkUserIsExist/data.go +++ b/iSolarCloud/AppService/checkUserIsExist/data.go @@ -1,11 +1,12 @@ package checkUserIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserIsExist" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserIsExist/struct.go b/iSolarCloud/AppService/checkUserIsExist/struct.go index a234875d6..c6530feaa 100644 --- a/iSolarCloud/AppService/checkUserIsExist/struct.go +++ b/iSolarCloud/AppService/checkUserIsExist/struct.go @@ -5,9 +5,9 @@ package checkUserIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserListIsExist/data.go b/iSolarCloud/AppService/checkUserListIsExist/data.go index 47b18e2b1..199cb0e43 100644 --- a/iSolarCloud/AppService/checkUserListIsExist/data.go +++ b/iSolarCloud/AppService/checkUserListIsExist/data.go @@ -1,11 +1,12 @@ package checkUserListIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserListIsExist" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserListIsExist/struct.go b/iSolarCloud/AppService/checkUserListIsExist/struct.go index e209005bd..5940a906e 100644 --- a/iSolarCloud/AppService/checkUserListIsExist/struct.go +++ b/iSolarCloud/AppService/checkUserListIsExist/struct.go @@ -5,9 +5,9 @@ package checkUserListIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/checkUserPassword/data.go b/iSolarCloud/AppService/checkUserPassword/data.go index 10e28e9d8..bb9c19980 100644 --- a/iSolarCloud/AppService/checkUserPassword/data.go +++ b/iSolarCloud/AppService/checkUserPassword/data.go @@ -1,11 +1,12 @@ package checkUserPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/checkUserPassword" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/checkUserPassword/struct.go b/iSolarCloud/AppService/checkUserPassword/struct.go index 8b1ee180c..49a3f20da 100644 --- a/iSolarCloud/AppService/checkUserPassword/struct.go +++ b/iSolarCloud/AppService/checkUserPassword/struct.go @@ -5,9 +5,9 @@ package checkUserPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/cloudDeploymentRecord/data.go b/iSolarCloud/AppService/cloudDeploymentRecord/data.go index 300bdc00e..f54b91672 100644 --- a/iSolarCloud/AppService/cloudDeploymentRecord/data.go +++ b/iSolarCloud/AppService/cloudDeploymentRecord/data.go @@ -1,11 +1,12 @@ package cloudDeploymentRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/cloudDeploymentRecord" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/cloudDeploymentRecord/struct.go b/iSolarCloud/AppService/cloudDeploymentRecord/struct.go index 3ad4ad141..e96a28a23 100644 --- a/iSolarCloud/AppService/cloudDeploymentRecord/struct.go +++ b/iSolarCloud/AppService/cloudDeploymentRecord/struct.go @@ -5,9 +5,9 @@ package cloudDeploymentRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/comfirmParamModel/data.go b/iSolarCloud/AppService/comfirmParamModel/data.go index a3a27633d..795b02870 100644 --- a/iSolarCloud/AppService/comfirmParamModel/data.go +++ b/iSolarCloud/AppService/comfirmParamModel/data.go @@ -1,11 +1,12 @@ package comfirmParamModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/comfirmParamModel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/comfirmParamModel/struct.go b/iSolarCloud/AppService/comfirmParamModel/struct.go index edac6cb67..b6f255160 100644 --- a/iSolarCloud/AppService/comfirmParamModel/struct.go +++ b/iSolarCloud/AppService/comfirmParamModel/struct.go @@ -5,9 +5,9 @@ package comfirmParamModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/communicationModuleDetail/data.go b/iSolarCloud/AppService/communicationModuleDetail/data.go index 7aaad538b..1f6b5e7a5 100644 --- a/iSolarCloud/AppService/communicationModuleDetail/data.go +++ b/iSolarCloud/AppService/communicationModuleDetail/data.go @@ -1,11 +1,12 @@ package communicationModuleDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/communicationModuleDetail" diff --git a/iSolarCloud/AppService/communicationModuleDetail/struct.go b/iSolarCloud/AppService/communicationModuleDetail/struct.go index 78fa0c1a6..8ba89542b 100644 --- a/iSolarCloud/AppService/communicationModuleDetail/struct.go +++ b/iSolarCloud/AppService/communicationModuleDetail/struct.go @@ -5,9 +5,9 @@ package communicationModuleDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/compareValidateCode/data.go b/iSolarCloud/AppService/compareValidateCode/data.go index 3ca110d3d..c84cf00b2 100644 --- a/iSolarCloud/AppService/compareValidateCode/data.go +++ b/iSolarCloud/AppService/compareValidateCode/data.go @@ -1,11 +1,12 @@ package compareValidateCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/compareValidateCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/compareValidateCode/struct.go b/iSolarCloud/AppService/compareValidateCode/struct.go index 28a0850c5..596fe987e 100644 --- a/iSolarCloud/AppService/compareValidateCode/struct.go +++ b/iSolarCloud/AppService/compareValidateCode/struct.go @@ -5,9 +5,9 @@ package compareValidateCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/componentInfo2Cloud/data.go b/iSolarCloud/AppService/componentInfo2Cloud/data.go index b01000e97..551396204 100644 --- a/iSolarCloud/AppService/componentInfo2Cloud/data.go +++ b/iSolarCloud/AppService/componentInfo2Cloud/data.go @@ -1,11 +1,12 @@ package componentInfo2Cloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/componentInfo2Cloud" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/componentInfo2Cloud/struct.go b/iSolarCloud/AppService/componentInfo2Cloud/struct.go index 43d552656..4cf97ed42 100644 --- a/iSolarCloud/AppService/componentInfo2Cloud/struct.go +++ b/iSolarCloud/AppService/componentInfo2Cloud/struct.go @@ -5,9 +5,9 @@ package componentInfo2Cloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/confirmFault/data.go b/iSolarCloud/AppService/confirmFault/data.go index a27d05895..7efe20aad 100644 --- a/iSolarCloud/AppService/confirmFault/data.go +++ b/iSolarCloud/AppService/confirmFault/data.go @@ -1,11 +1,12 @@ package confirmFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/confirmFault" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/confirmFault/struct.go b/iSolarCloud/AppService/confirmFault/struct.go index 488e59277..6e8b318bb 100644 --- a/iSolarCloud/AppService/confirmFault/struct.go +++ b/iSolarCloud/AppService/confirmFault/struct.go @@ -5,9 +5,9 @@ package confirmFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/confirmIvFault/data.go b/iSolarCloud/AppService/confirmIvFault/data.go index 654be12da..2334ef67b 100644 --- a/iSolarCloud/AppService/confirmIvFault/data.go +++ b/iSolarCloud/AppService/confirmIvFault/data.go @@ -1,11 +1,12 @@ package confirmIvFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/confirmIvFault" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/confirmIvFault/struct.go b/iSolarCloud/AppService/confirmIvFault/struct.go index 071622c2c..97b3c332d 100644 --- a/iSolarCloud/AppService/confirmIvFault/struct.go +++ b/iSolarCloud/AppService/confirmIvFault/struct.go @@ -5,9 +5,9 @@ package confirmIvFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/confirmReportConfig/data.go b/iSolarCloud/AppService/confirmReportConfig/data.go index 8cd4e3068..08493f253 100644 --- a/iSolarCloud/AppService/confirmReportConfig/data.go +++ b/iSolarCloud/AppService/confirmReportConfig/data.go @@ -1,11 +1,12 @@ package confirmReportConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/confirmReportConfig" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/confirmReportConfig/struct.go b/iSolarCloud/AppService/confirmReportConfig/struct.go index de58d407d..cee8f2ea9 100644 --- a/iSolarCloud/AppService/confirmReportConfig/struct.go +++ b/iSolarCloud/AppService/confirmReportConfig/struct.go @@ -5,9 +5,9 @@ package confirmReportConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/createAppkeyInfo/data.go b/iSolarCloud/AppService/createAppkeyInfo/data.go index 4078b65d2..4e0f00d8b 100644 --- a/iSolarCloud/AppService/createAppkeyInfo/data.go +++ b/iSolarCloud/AppService/createAppkeyInfo/data.go @@ -1,11 +1,12 @@ package createAppkeyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/createAppkeyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/createAppkeyInfo/struct.go b/iSolarCloud/AppService/createAppkeyInfo/struct.go index 5a0efb0a9..102da4a74 100644 --- a/iSolarCloud/AppService/createAppkeyInfo/struct.go +++ b/iSolarCloud/AppService/createAppkeyInfo/struct.go @@ -5,9 +5,9 @@ package createAppkeyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/createRenewInvoice/data.go b/iSolarCloud/AppService/createRenewInvoice/data.go index 269aa6466..637256a96 100644 --- a/iSolarCloud/AppService/createRenewInvoice/data.go +++ b/iSolarCloud/AppService/createRenewInvoice/data.go @@ -1,11 +1,12 @@ package createRenewInvoice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/createRenewInvoice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/createRenewInvoice/struct.go b/iSolarCloud/AppService/createRenewInvoice/struct.go index d7cd4f8d8..9d8c2849d 100644 --- a/iSolarCloud/AppService/createRenewInvoice/struct.go +++ b/iSolarCloud/AppService/createRenewInvoice/struct.go @@ -5,9 +5,9 @@ package createRenewInvoice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealCommandReply/data.go b/iSolarCloud/AppService/dealCommandReply/data.go index 012849f16..a1bc25916 100644 --- a/iSolarCloud/AppService/dealCommandReply/data.go +++ b/iSolarCloud/AppService/dealCommandReply/data.go @@ -1,11 +1,12 @@ package dealCommandReply import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/dealCommandReply" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealCommandReply/struct.go b/iSolarCloud/AppService/dealCommandReply/struct.go index 1520bd700..c986a5ea7 100644 --- a/iSolarCloud/AppService/dealCommandReply/struct.go +++ b/iSolarCloud/AppService/dealCommandReply/struct.go @@ -5,9 +5,9 @@ package dealCommandReply import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go b/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go index a776c98ce..eafe0efaf 100644 --- a/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go +++ b/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go @@ -1,11 +1,12 @@ package dealDeletePsFailPsDelete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/dealDeletePsFailPsDelete" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go b/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go index f4505cebe..e02a8a064 100644 --- a/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go +++ b/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go @@ -5,9 +5,9 @@ package dealDeletePsFailPsDelete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go index c815a66d5..a9b037ab2 100644 --- a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go +++ b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go @@ -1,11 +1,12 @@ package dealFailRemoteUpgradeSubTasks import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealFailRemoteUpgradeSubTasks" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go index 963553ce7..2ec0c52bc 100644 --- a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go +++ b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go @@ -5,9 +5,9 @@ package dealFailRemoteUpgradeSubTasks import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go index c5171416c..f2828910b 100644 --- a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go +++ b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go @@ -1,11 +1,12 @@ package dealFailRemoteUpgradeTasks import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealFailRemoteUpgradeTasks" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go index b8551b829..01d7dfa63 100644 --- a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go +++ b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go @@ -5,9 +5,9 @@ package dealFailRemoteUpgradeTasks import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealFaultOrder/data.go b/iSolarCloud/AppService/dealFaultOrder/data.go index f4730220c..0745a97b7 100644 --- a/iSolarCloud/AppService/dealFaultOrder/data.go +++ b/iSolarCloud/AppService/dealFaultOrder/data.go @@ -1,11 +1,12 @@ package dealFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/dealFaultOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealFaultOrder/struct.go b/iSolarCloud/AppService/dealFaultOrder/struct.go index c5eb16998..6f2ef0d19 100644 --- a/iSolarCloud/AppService/dealFaultOrder/struct.go +++ b/iSolarCloud/AppService/dealFaultOrder/struct.go @@ -5,9 +5,9 @@ package dealFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go index af3096eca..dd23a330b 100644 --- a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go +++ b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go @@ -1,11 +1,12 @@ package dealGroupStringDisableOrEnable import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealGroupStringDisableOrEnable" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go index 0a2ba14f3..d93a8a9b5 100644 --- a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go +++ b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go @@ -5,9 +5,9 @@ package dealGroupStringDisableOrEnable import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go index c042ea5ae..47373d4a6 100644 --- a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go +++ b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go @@ -1,11 +1,12 @@ package dealNumberOfServiceCalls2Mysql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/dealNumberOfServiceCalls2Mysql" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go index 70d44c566..972cd78c0 100644 --- a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go +++ b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go @@ -5,9 +5,9 @@ package dealNumberOfServiceCalls2Mysql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go b/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go index ad74d5a07..b44d2efee 100644 --- a/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go +++ b/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go @@ -1,11 +1,12 @@ package dealParamSettingAfterComplete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealParamSettingAfterComplete" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go b/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go index 6d6f1f255..fda8b3c7f 100644 --- a/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go +++ b/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go @@ -5,9 +5,9 @@ package dealParamSettingAfterComplete import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealPsDataSupplement/data.go b/iSolarCloud/AppService/dealPsDataSupplement/data.go index 85418ddc6..5c58d244a 100644 --- a/iSolarCloud/AppService/dealPsDataSupplement/data.go +++ b/iSolarCloud/AppService/dealPsDataSupplement/data.go @@ -1,11 +1,12 @@ package dealPsDataSupplement import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/dealPsDataSupplement" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealPsDataSupplement/struct.go b/iSolarCloud/AppService/dealPsDataSupplement/struct.go index d2f30ccfd..ff6bf0cb0 100644 --- a/iSolarCloud/AppService/dealPsDataSupplement/struct.go +++ b/iSolarCloud/AppService/dealPsDataSupplement/struct.go @@ -5,9 +5,9 @@ package dealPsDataSupplement import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealPsReportEmailSend/data.go b/iSolarCloud/AppService/dealPsReportEmailSend/data.go index acc62a09b..8118b403d 100644 --- a/iSolarCloud/AppService/dealPsReportEmailSend/data.go +++ b/iSolarCloud/AppService/dealPsReportEmailSend/data.go @@ -1,11 +1,12 @@ package dealPsReportEmailSend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/dealPsReportEmailSend" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealPsReportEmailSend/struct.go b/iSolarCloud/AppService/dealPsReportEmailSend/struct.go index 73e26a096..775c5973e 100644 --- a/iSolarCloud/AppService/dealPsReportEmailSend/struct.go +++ b/iSolarCloud/AppService/dealPsReportEmailSend/struct.go @@ -5,9 +5,9 @@ package dealPsReportEmailSend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealRemoteUpgrade/data.go b/iSolarCloud/AppService/dealRemoteUpgrade/data.go index bfa04841d..f309eb37c 100644 --- a/iSolarCloud/AppService/dealRemoteUpgrade/data.go +++ b/iSolarCloud/AppService/dealRemoteUpgrade/data.go @@ -1,11 +1,12 @@ package dealRemoteUpgrade import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealRemoteUpgrade" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealRemoteUpgrade/struct.go b/iSolarCloud/AppService/dealRemoteUpgrade/struct.go index fe4a94e7c..e421c244c 100644 --- a/iSolarCloud/AppService/dealRemoteUpgrade/struct.go +++ b/iSolarCloud/AppService/dealRemoteUpgrade/struct.go @@ -5,9 +5,9 @@ package dealRemoteUpgrade import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealSnElectrifyCheck/data.go b/iSolarCloud/AppService/dealSnElectrifyCheck/data.go index c4c79a53a..09fa83c8d 100644 --- a/iSolarCloud/AppService/dealSnElectrifyCheck/data.go +++ b/iSolarCloud/AppService/dealSnElectrifyCheck/data.go @@ -1,11 +1,12 @@ package dealSnElectrifyCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealSnElectrifyCheck" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go b/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go index 4ca6fd8a7..204d808b6 100644 --- a/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go +++ b/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go @@ -5,9 +5,9 @@ package dealSnElectrifyCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go index 0b1b87f53..b5655dd58 100644 --- a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go +++ b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go @@ -1,11 +1,12 @@ package dealSysDeviceSimFlowInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealSysDeviceSimFlowInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go index f029bd696..18eaaf7ff 100644 --- a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go +++ b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go @@ -5,9 +5,9 @@ package dealSysDeviceSimFlowInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go b/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go index 7e3de4ea3..cca65d7f1 100644 --- a/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go +++ b/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go @@ -1,11 +1,12 @@ package dealSysDeviceSimInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/dealSysDeviceSimInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go b/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go index 9ff751f0d..d89eba749 100644 --- a/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go +++ b/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go @@ -5,9 +5,9 @@ package dealSysDeviceSimInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go index bdd4aa125..e8f613c2f 100644 --- a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go +++ b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go @@ -1,11 +1,12 @@ package definiteTimeDealSnExpRemind import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/definiteTimeDealSnExpRemind" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go index bd82b6abb..e98067652 100644 --- a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go +++ b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go @@ -5,9 +5,9 @@ package definiteTimeDealSnExpRemind import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go b/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go index ce43f644c..45c0029c8 100644 --- a/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go +++ b/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go @@ -1,11 +1,12 @@ package definiteTimeDealSnStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/definiteTimeDealSnStatus" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go b/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go index 83c5d93f9..4ec8c9a40 100644 --- a/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go +++ b/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go @@ -5,9 +5,9 @@ package definiteTimeDealSnStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/delDeviceRepair/data.go b/iSolarCloud/AppService/delDeviceRepair/data.go index 3b14b45bf..fc102637f 100644 --- a/iSolarCloud/AppService/delDeviceRepair/data.go +++ b/iSolarCloud/AppService/delDeviceRepair/data.go @@ -1,11 +1,12 @@ package delDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/delDeviceRepair" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/delDeviceRepair/struct.go b/iSolarCloud/AppService/delDeviceRepair/struct.go index 2f64b9949..8854133cf 100644 --- a/iSolarCloud/AppService/delDeviceRepair/struct.go +++ b/iSolarCloud/AppService/delDeviceRepair/struct.go @@ -5,9 +5,9 @@ package delDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/delOperRule/data.go b/iSolarCloud/AppService/delOperRule/data.go index 61f64c0ae..33f044b83 100644 --- a/iSolarCloud/AppService/delOperRule/data.go +++ b/iSolarCloud/AppService/delOperRule/data.go @@ -1,11 +1,12 @@ package delOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/delOperRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/delOperRule/struct.go b/iSolarCloud/AppService/delOperRule/struct.go index f9348c5ee..2d10d4207 100644 --- a/iSolarCloud/AppService/delOperRule/struct.go +++ b/iSolarCloud/AppService/delOperRule/struct.go @@ -5,9 +5,9 @@ package delOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/delayCallApiResidueTimes/data.go b/iSolarCloud/AppService/delayCallApiResidueTimes/data.go index efa30ba88..1a95f2203 100644 --- a/iSolarCloud/AppService/delayCallApiResidueTimes/data.go +++ b/iSolarCloud/AppService/delayCallApiResidueTimes/data.go @@ -1,11 +1,12 @@ package delayCallApiResidueTimes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/delayCallApiResidueTimes" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go b/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go index 6d78b8e96..18db9a857 100644 --- a/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go +++ b/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go @@ -5,9 +5,9 @@ package delayCallApiResidueTimes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteComponent/data.go b/iSolarCloud/AppService/deleteComponent/data.go index d7f90a853..6d6800e55 100644 --- a/iSolarCloud/AppService/deleteComponent/data.go +++ b/iSolarCloud/AppService/deleteComponent/data.go @@ -1,11 +1,12 @@ package deleteComponent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteComponent" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteComponent/struct.go b/iSolarCloud/AppService/deleteComponent/struct.go index 08950c62f..9d9f32370 100644 --- a/iSolarCloud/AppService/deleteComponent/struct.go +++ b/iSolarCloud/AppService/deleteComponent/struct.go @@ -5,9 +5,9 @@ package deleteComponent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteCustomerEmployee/data.go b/iSolarCloud/AppService/deleteCustomerEmployee/data.go index 6a52b9d0b..6c1506bbb 100644 --- a/iSolarCloud/AppService/deleteCustomerEmployee/data.go +++ b/iSolarCloud/AppService/deleteCustomerEmployee/data.go @@ -1,11 +1,12 @@ package deleteCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteCustomerEmployee" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteCustomerEmployee/struct.go b/iSolarCloud/AppService/deleteCustomerEmployee/struct.go index 753fd1aaf..2f99c927c 100644 --- a/iSolarCloud/AppService/deleteCustomerEmployee/struct.go +++ b/iSolarCloud/AppService/deleteCustomerEmployee/struct.go @@ -5,9 +5,9 @@ package deleteCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteDeviceAccount/data.go b/iSolarCloud/AppService/deleteDeviceAccount/data.go index e91081ec9..8771ddbf4 100644 --- a/iSolarCloud/AppService/deleteDeviceAccount/data.go +++ b/iSolarCloud/AppService/deleteDeviceAccount/data.go @@ -1,11 +1,12 @@ package deleteDeviceAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteDeviceAccount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteDeviceAccount/struct.go b/iSolarCloud/AppService/deleteDeviceAccount/struct.go index 1519816f7..4eaa69754 100644 --- a/iSolarCloud/AppService/deleteDeviceAccount/struct.go +++ b/iSolarCloud/AppService/deleteDeviceAccount/struct.go @@ -5,9 +5,9 @@ package deleteDeviceAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteDeviceSimById/data.go b/iSolarCloud/AppService/deleteDeviceSimById/data.go index 8b674b44c..ef6b297e5 100644 --- a/iSolarCloud/AppService/deleteDeviceSimById/data.go +++ b/iSolarCloud/AppService/deleteDeviceSimById/data.go @@ -1,11 +1,12 @@ package deleteDeviceSimById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteDeviceSimById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteDeviceSimById/struct.go b/iSolarCloud/AppService/deleteDeviceSimById/struct.go index 5072616a4..f3f835b3b 100644 --- a/iSolarCloud/AppService/deleteDeviceSimById/struct.go +++ b/iSolarCloud/AppService/deleteDeviceSimById/struct.go @@ -5,9 +5,9 @@ package deleteDeviceSimById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteElectricitySettlementData/data.go b/iSolarCloud/AppService/deleteElectricitySettlementData/data.go index 7a9bf1bb2..7fc1f1ca9 100644 --- a/iSolarCloud/AppService/deleteElectricitySettlementData/data.go +++ b/iSolarCloud/AppService/deleteElectricitySettlementData/data.go @@ -1,11 +1,12 @@ package deleteElectricitySettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteElectricitySettlementData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go b/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go index b49bc80eb..89eb1634c 100644 --- a/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go +++ b/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go @@ -5,9 +5,9 @@ package deleteElectricitySettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteFaultPlan/data.go b/iSolarCloud/AppService/deleteFaultPlan/data.go index 13089403f..49bc983c2 100644 --- a/iSolarCloud/AppService/deleteFaultPlan/data.go +++ b/iSolarCloud/AppService/deleteFaultPlan/data.go @@ -1,11 +1,12 @@ package deleteFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteFaultPlan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteFaultPlan/struct.go b/iSolarCloud/AppService/deleteFaultPlan/struct.go index eddb544c5..c7788edf1 100644 --- a/iSolarCloud/AppService/deleteFaultPlan/struct.go +++ b/iSolarCloud/AppService/deleteFaultPlan/struct.go @@ -5,9 +5,9 @@ package deleteFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteFirmwareFiles/data.go b/iSolarCloud/AppService/deleteFirmwareFiles/data.go index f4474ffd1..258240013 100644 --- a/iSolarCloud/AppService/deleteFirmwareFiles/data.go +++ b/iSolarCloud/AppService/deleteFirmwareFiles/data.go @@ -1,11 +1,12 @@ package deleteFirmwareFiles import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/deleteFirmwareFiles" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteFirmwareFiles/struct.go b/iSolarCloud/AppService/deleteFirmwareFiles/struct.go index 37ef26622..a0ff77d3f 100644 --- a/iSolarCloud/AppService/deleteFirmwareFiles/struct.go +++ b/iSolarCloud/AppService/deleteFirmwareFiles/struct.go @@ -5,9 +5,9 @@ package deleteFirmwareFiles import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go b/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go index 77128e0c8..f4714e963 100644 --- a/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go +++ b/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go @@ -1,11 +1,12 @@ package deleteHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteHouseholdEvaluation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go b/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go index ad5c00fdc..8f398662f 100644 --- a/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go +++ b/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go @@ -5,9 +5,9 @@ package deleteHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go index 3274df070..ef570fb51 100644 --- a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go +++ b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go @@ -1,11 +1,12 @@ package deleteHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteHouseholdLeaveMessage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go index 7f02568fb..932ef6e23 100644 --- a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go +++ b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go @@ -5,9 +5,9 @@ package deleteHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go b/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go index 234eb7257..e31d54f4f 100644 --- a/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go +++ b/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go @@ -1,11 +1,12 @@ package deleteHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteHouseholdWorkOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go index 0bd133c90..42c85d1d1 100644 --- a/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go +++ b/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go @@ -5,9 +5,9 @@ package deleteHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go b/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go index bda7e406d..0a7691b8d 100644 --- a/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go +++ b/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go @@ -1,11 +1,12 @@ package deleteInverterSnInChnnl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/deleteInverterSnInChnnl" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go b/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go index d804b7f7b..e11dea0c0 100644 --- a/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go +++ b/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go @@ -5,9 +5,9 @@ package deleteInverterSnInChnnl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteModuleLog/data.go b/iSolarCloud/AppService/deleteModuleLog/data.go index 1d323ffd6..86bbdd046 100644 --- a/iSolarCloud/AppService/deleteModuleLog/data.go +++ b/iSolarCloud/AppService/deleteModuleLog/data.go @@ -1,11 +1,12 @@ package deleteModuleLog import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/deleteModuleLog" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteModuleLog/struct.go b/iSolarCloud/AppService/deleteModuleLog/struct.go index 956149cc7..c9c9f6fb6 100644 --- a/iSolarCloud/AppService/deleteModuleLog/struct.go +++ b/iSolarCloud/AppService/deleteModuleLog/struct.go @@ -5,9 +5,9 @@ package deleteModuleLog import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteOnDutyInfo/data.go b/iSolarCloud/AppService/deleteOnDutyInfo/data.go index 584d12133..4764b1cc2 100644 --- a/iSolarCloud/AppService/deleteOnDutyInfo/data.go +++ b/iSolarCloud/AppService/deleteOnDutyInfo/data.go @@ -1,11 +1,12 @@ package deleteOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteOnDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteOnDutyInfo/struct.go b/iSolarCloud/AppService/deleteOnDutyInfo/struct.go index d02c4a35e..7bd61064f 100644 --- a/iSolarCloud/AppService/deleteOnDutyInfo/struct.go +++ b/iSolarCloud/AppService/deleteOnDutyInfo/struct.go @@ -5,9 +5,9 @@ package deleteOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteOperateBillFile/data.go b/iSolarCloud/AppService/deleteOperateBillFile/data.go index 4a6930d3e..6a7249717 100644 --- a/iSolarCloud/AppService/deleteOperateBillFile/data.go +++ b/iSolarCloud/AppService/deleteOperateBillFile/data.go @@ -1,11 +1,12 @@ package deleteOperateBillFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteOperateBillFile" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteOperateBillFile/struct.go b/iSolarCloud/AppService/deleteOperateBillFile/struct.go index 8e9b3a2f6..09834559a 100644 --- a/iSolarCloud/AppService/deleteOperateBillFile/struct.go +++ b/iSolarCloud/AppService/deleteOperateBillFile/struct.go @@ -5,9 +5,9 @@ package deleteOperateBillFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteOssObject/data.go b/iSolarCloud/AppService/deleteOssObject/data.go index 3911537ac..2e9f992ce 100644 --- a/iSolarCloud/AppService/deleteOssObject/data.go +++ b/iSolarCloud/AppService/deleteOssObject/data.go @@ -1,11 +1,12 @@ package deleteOssObject import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/deleteOssObject" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteOssObject/struct.go b/iSolarCloud/AppService/deleteOssObject/struct.go index 01cd3a62f..4d76d8ff7 100644 --- a/iSolarCloud/AppService/deleteOssObject/struct.go +++ b/iSolarCloud/AppService/deleteOssObject/struct.go @@ -5,9 +5,9 @@ package deleteOssObject import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deletePowerDevicePointById/data.go b/iSolarCloud/AppService/deletePowerDevicePointById/data.go index 6262d2f91..e59f16f98 100644 --- a/iSolarCloud/AppService/deletePowerDevicePointById/data.go +++ b/iSolarCloud/AppService/deletePowerDevicePointById/data.go @@ -1,11 +1,12 @@ package deletePowerDevicePointById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/deletePowerDevicePointById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deletePowerDevicePointById/struct.go b/iSolarCloud/AppService/deletePowerDevicePointById/struct.go index e8468ab00..e2f609007 100644 --- a/iSolarCloud/AppService/deletePowerDevicePointById/struct.go +++ b/iSolarCloud/AppService/deletePowerDevicePointById/struct.go @@ -5,9 +5,9 @@ package deletePowerDevicePointById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deletePowerPicture/data.go b/iSolarCloud/AppService/deletePowerPicture/data.go index 47c374639..9b6909b38 100644 --- a/iSolarCloud/AppService/deletePowerPicture/data.go +++ b/iSolarCloud/AppService/deletePowerPicture/data.go @@ -1,11 +1,12 @@ package deletePowerPicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/deletePowerPicture" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deletePowerPicture/struct.go b/iSolarCloud/AppService/deletePowerPicture/struct.go index 2c025277a..7755b155f 100644 --- a/iSolarCloud/AppService/deletePowerPicture/struct.go +++ b/iSolarCloud/AppService/deletePowerPicture/struct.go @@ -5,9 +5,9 @@ package deletePowerPicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go index e257fa1ac..a12bca493 100644 --- a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go +++ b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go @@ -1,11 +1,12 @@ package deletePowerRobotInfoBySnAndPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerRobotInfoBySnAndPsId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go index d7e703b0c..de69eadd1 100644 --- a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go +++ b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go @@ -5,9 +5,9 @@ package deletePowerRobotInfoBySnAndPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go index 4393e1f3f..0faee64f8 100644 --- a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go +++ b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go @@ -1,11 +1,12 @@ package deletePowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerRobotSweepStrategy" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go index fcf69d374..682558584 100644 --- a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go +++ b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go @@ -5,9 +5,9 @@ package deletePowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteProductionData/data.go b/iSolarCloud/AppService/deleteProductionData/data.go index 633a0605b..7d2aca363 100644 --- a/iSolarCloud/AppService/deleteProductionData/data.go +++ b/iSolarCloud/AppService/deleteProductionData/data.go @@ -1,11 +1,12 @@ package deleteProductionData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteProductionData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteProductionData/struct.go b/iSolarCloud/AppService/deleteProductionData/struct.go index db9b61b8b..44fb9bf6a 100644 --- a/iSolarCloud/AppService/deleteProductionData/struct.go +++ b/iSolarCloud/AppService/deleteProductionData/struct.go @@ -5,9 +5,9 @@ package deleteProductionData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deletePs/data.go b/iSolarCloud/AppService/deletePs/data.go index 10f030c4a..6da706bd8 100644 --- a/iSolarCloud/AppService/deletePs/data.go +++ b/iSolarCloud/AppService/deletePs/data.go @@ -1,11 +1,12 @@ package deletePs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/deletePs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deletePs/struct.go b/iSolarCloud/AppService/deletePs/struct.go index e41a914f1..57b91df5c 100644 --- a/iSolarCloud/AppService/deletePs/struct.go +++ b/iSolarCloud/AppService/deletePs/struct.go @@ -5,9 +5,9 @@ package deletePs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteRechargeOrder/data.go b/iSolarCloud/AppService/deleteRechargeOrder/data.go index 32aea6c67..5e5fd9bc7 100644 --- a/iSolarCloud/AppService/deleteRechargeOrder/data.go +++ b/iSolarCloud/AppService/deleteRechargeOrder/data.go @@ -1,11 +1,12 @@ package deleteRechargeOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/deleteRechargeOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteRechargeOrder/struct.go b/iSolarCloud/AppService/deleteRechargeOrder/struct.go index a43175d37..c171b9239 100644 --- a/iSolarCloud/AppService/deleteRechargeOrder/struct.go +++ b/iSolarCloud/AppService/deleteRechargeOrder/struct.go @@ -5,9 +5,9 @@ package deleteRechargeOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go index 101685c29..a581436e4 100644 --- a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go +++ b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go @@ -1,11 +1,12 @@ package deleteRegularlyConnectionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/deleteRegularlyConnectionInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go index f5d9cccc0..083e3bcc5 100644 --- a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go +++ b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go @@ -5,9 +5,9 @@ package deleteRegularlyConnectionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go b/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go index a36b5942a..6ef2c0163 100644 --- a/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go +++ b/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go @@ -1,11 +1,12 @@ package deleteReportConfigEmailAddr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/deleteReportConfigEmailAddr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go b/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go index d5b31c9a5..18ab32951 100644 --- a/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go +++ b/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go @@ -5,9 +5,9 @@ package deleteReportConfigEmailAddr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteSysAdvancedParam/data.go b/iSolarCloud/AppService/deleteSysAdvancedParam/data.go index 7a71d0fe2..c3187d87e 100644 --- a/iSolarCloud/AppService/deleteSysAdvancedParam/data.go +++ b/iSolarCloud/AppService/deleteSysAdvancedParam/data.go @@ -1,11 +1,12 @@ package deleteSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteSysAdvancedParam" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go b/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go index 8cf36d17e..36cd6248e 100644 --- a/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go +++ b/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go @@ -5,9 +5,9 @@ package deleteSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteSysOrgNew/data.go b/iSolarCloud/AppService/deleteSysOrgNew/data.go index 38625040a..5ad88aa5b 100644 --- a/iSolarCloud/AppService/deleteSysOrgNew/data.go +++ b/iSolarCloud/AppService/deleteSysOrgNew/data.go @@ -1,11 +1,12 @@ package deleteSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteSysOrgNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteSysOrgNew/struct.go b/iSolarCloud/AppService/deleteSysOrgNew/struct.go index 377c80610..0c0326ec1 100644 --- a/iSolarCloud/AppService/deleteSysOrgNew/struct.go +++ b/iSolarCloud/AppService/deleteSysOrgNew/struct.go @@ -5,9 +5,9 @@ package deleteSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteTemplate/data.go b/iSolarCloud/AppService/deleteTemplate/data.go index eaabea50c..060226d30 100644 --- a/iSolarCloud/AppService/deleteTemplate/data.go +++ b/iSolarCloud/AppService/deleteTemplate/data.go @@ -1,11 +1,12 @@ package deleteTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteTemplate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteTemplate/struct.go b/iSolarCloud/AppService/deleteTemplate/struct.go index 2ed8a1198..3a695d7f5 100644 --- a/iSolarCloud/AppService/deleteTemplate/struct.go +++ b/iSolarCloud/AppService/deleteTemplate/struct.go @@ -5,9 +5,9 @@ package deleteTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go b/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go index f9fdfadcd..0043f3177 100644 --- a/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go +++ b/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go @@ -1,11 +1,12 @@ package deleteUserInfoAllByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/deleteUserInfoAllByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go b/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go index 46cc33593..3c3c36501 100644 --- a/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go +++ b/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go @@ -5,9 +5,9 @@ package deleteUserInfoAllByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go index f71e0a2d9..66f592c62 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go +++ b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go @@ -1,11 +1,12 @@ package deviceInputDiscreteDeleteTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceInputDiscreteDeleteTime" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go index 8d1b3033a..d0d9b68cd 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go +++ b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go @@ -5,9 +5,9 @@ package deviceInputDiscreteDeleteTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go index d0d476c14..5e39ea500 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go +++ b/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go @@ -1,11 +1,12 @@ package deviceInputDiscreteGetTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceInputDiscreteGetTime" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go index 057ecad19..3e713ba33 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go +++ b/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go @@ -5,9 +5,9 @@ package deviceInputDiscreteGetTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go index d384f2607..ff51ae3b3 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go +++ b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go @@ -1,11 +1,12 @@ package deviceInputDiscreteInsertTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceInputDiscreteInsertTime" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go index 1c972dc89..5bb35c170 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go +++ b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go @@ -5,9 +5,9 @@ package deviceInputDiscreteInsertTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go index 6804159f4..91faa8325 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go +++ b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go @@ -1,11 +1,12 @@ package deviceInputDiscreteUpdateTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceInputDiscreteUpdateTime" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go index 3c08677ea..9496d2a0b 100644 --- a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go +++ b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go @@ -5,9 +5,9 @@ package deviceInputDiscreteUpdateTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/devicePointsDataFromMySql/data.go b/iSolarCloud/AppService/devicePointsDataFromMySql/data.go index 8a2b90763..a8ba86f58 100644 --- a/iSolarCloud/AppService/devicePointsDataFromMySql/data.go +++ b/iSolarCloud/AppService/devicePointsDataFromMySql/data.go @@ -1,10 +1,11 @@ package devicePointsDataFromMySql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "AppService.devicePointsDataFromMySql" type RequestData struct { - PsKey valueTypes.PsKey `json:"ps_key" required:"true"` + PsKey valueTypes.PsKey `json:"ps_key" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,45 +26,44 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { DevicePointData []struct { - AlarmCount valueTypes.Count `json:"alarm_count"` - DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` - DevStatus valueTypes.Integer `json:"dev_status"` + AlarmCount valueTypes.Count `json:"alarm_count"` + DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` + DevStatus valueTypes.Integer `json:"dev_status"` DevUpdateTime valueTypes.DateTime `json:"dev_update_time" PointNameDateFormat:"DateTimeLayout"` - FaultCount valueTypes.Count `json:"fault_count"` - InstallerAlarmCount valueTypes.Count `json:"installer_alarm_count"` - InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` - InstallerFaultCount valueTypes.Count `json:"installer_fault_count"` - OwnerAlarmCount valueTypes.Count `json:"owner_alarm_count"` - OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` - OwnerFaultCount valueTypes.Integer `json:"owner_fault_count"` - P1 interface{} `json:"p1"` - P1001 interface{} `json:"p1001"` - P1002 interface{} `json:"p1002"` - P1005 interface{} `json:"p1005"` - P1302 interface{} `json:"p1302"` - P14 interface{} `json:"p14"` - P2 interface{} `json:"p2"` - P202 interface{} `json:"p202"` - P210 interface{} `json:"p210"` - P24 interface{} `json:"p24"` - P66 interface{} `json:"p66"` - P8018 interface{} `json:"p8018"` - P8030 interface{} `json:"p8030"` - P8031 interface{} `json:"p8031"` - P8062 interface{} `json:"p8062"` - P8063 interface{} `json:"p8063"` - P81002 interface{} `json:"p81002"` - P81022 interface{} `json:"p81022"` - P81023 interface{} `json:"p81023"` - P81202 interface{} `json:"p81202"` - P81203 interface{} `json:"p81203"` - PsKey valueTypes.PsKey `json:"ps_key"` + FaultCount valueTypes.Count `json:"fault_count"` + InstallerAlarmCount valueTypes.Count `json:"installer_alarm_count"` + InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` + InstallerFaultCount valueTypes.Count `json:"installer_fault_count"` + OwnerAlarmCount valueTypes.Count `json:"owner_alarm_count"` + OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` + OwnerFaultCount valueTypes.Integer `json:"owner_fault_count"` + P1 interface{} `json:"p1"` + P1001 interface{} `json:"p1001"` + P1002 interface{} `json:"p1002"` + P1005 interface{} `json:"p1005"` + P1302 interface{} `json:"p1302"` + P14 interface{} `json:"p14"` + P2 interface{} `json:"p2"` + P202 interface{} `json:"p202"` + P210 interface{} `json:"p210"` + P24 interface{} `json:"p24"` + P66 interface{} `json:"p66"` + P8018 interface{} `json:"p8018"` + P8030 interface{} `json:"p8030"` + P8031 interface{} `json:"p8031"` + P8062 interface{} `json:"p8062"` + P8063 interface{} `json:"p8063"` + P81002 interface{} `json:"p81002"` + P81022 interface{} `json:"p81022"` + P81023 interface{} `json:"p81023"` + P81202 interface{} `json:"p81202"` + P81203 interface{} `json:"p81203"` + PsKey valueTypes.PsKey `json:"ps_key"` UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` - UpdateUser valueTypes.Integer `json:"update_user"` - UUID valueTypes.Integer `json:"uuid"` + UpdateUser valueTypes.Integer `json:"update_user"` + UUID valueTypes.Integer `json:"uuid"` } `json:"device_point_data" DataTable:"true"` } @@ -79,7 +79,7 @@ func (e *EndPoint) GetData() api.DataMap { // pkg := reflection.GetName("", *e) // dt := valueTypes.NewDateTime(valueTypes.Now) // name := pkg + "." + e.Request.PsKey.String() - entries.StructToDataMap(*e, e.Request.PsKey.String(), GoStruct.NewEndPointPath(e.Request.PsKey.String())) + entries.StructToDataMap(*e, e.Request.PsKey.String(), GoStruct.NewEndPointPath(e.Request.PsKey.String())) } return entries diff --git a/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go b/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go index 73eea7e06..c0436a861 100644 --- a/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go +++ b/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go @@ -5,9 +5,9 @@ package devicePointsDataFromMySql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/deviceReplace/data.go b/iSolarCloud/AppService/deviceReplace/data.go index d32a08765..d1ae0f741 100644 --- a/iSolarCloud/AppService/deviceReplace/data.go +++ b/iSolarCloud/AppService/deviceReplace/data.go @@ -1,11 +1,12 @@ package deviceReplace import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceReplace" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/deviceReplace/struct.go b/iSolarCloud/AppService/deviceReplace/struct.go index c21362033..989922b6f 100644 --- a/iSolarCloud/AppService/deviceReplace/struct.go +++ b/iSolarCloud/AppService/deviceReplace/struct.go @@ -5,9 +5,9 @@ package deviceReplace import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/editDeviceRepair/data.go b/iSolarCloud/AppService/editDeviceRepair/data.go index 99715ced0..087eeaca7 100644 --- a/iSolarCloud/AppService/editDeviceRepair/data.go +++ b/iSolarCloud/AppService/editDeviceRepair/data.go @@ -1,11 +1,12 @@ package editDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/editDeviceRepair" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/editDeviceRepair/struct.go b/iSolarCloud/AppService/editDeviceRepair/struct.go index 355f531a2..d256e65e9 100644 --- a/iSolarCloud/AppService/editDeviceRepair/struct.go +++ b/iSolarCloud/AppService/editDeviceRepair/struct.go @@ -5,9 +5,9 @@ package editDeviceRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/editOperRule/data.go b/iSolarCloud/AppService/editOperRule/data.go index c3f077e1f..3e8571b41 100644 --- a/iSolarCloud/AppService/editOperRule/data.go +++ b/iSolarCloud/AppService/editOperRule/data.go @@ -1,11 +1,12 @@ package editOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/editOperRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/editOperRule/struct.go b/iSolarCloud/AppService/editOperRule/struct.go index a82112330..1a1fe78e9 100644 --- a/iSolarCloud/AppService/editOperRule/struct.go +++ b/iSolarCloud/AppService/editOperRule/struct.go @@ -5,9 +5,9 @@ package editOperRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/energyPovertyAlleviation/data.go b/iSolarCloud/AppService/energyPovertyAlleviation/data.go index 3c0ca79ee..162c94690 100644 --- a/iSolarCloud/AppService/energyPovertyAlleviation/data.go +++ b/iSolarCloud/AppService/energyPovertyAlleviation/data.go @@ -1,11 +1,12 @@ package energyPovertyAlleviation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/energyPovertyAlleviation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/energyPovertyAlleviation/struct.go b/iSolarCloud/AppService/energyPovertyAlleviation/struct.go index 3fcb08af7..4c6ff4978 100644 --- a/iSolarCloud/AppService/energyPovertyAlleviation/struct.go +++ b/iSolarCloud/AppService/energyPovertyAlleviation/struct.go @@ -5,9 +5,9 @@ package energyPovertyAlleviation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/energyTrend/data.go b/iSolarCloud/AppService/energyTrend/data.go index f9a834e8b..074d507e3 100644 --- a/iSolarCloud/AppService/energyTrend/data.go +++ b/iSolarCloud/AppService/energyTrend/data.go @@ -1,10 +1,11 @@ package energyTrend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -49,7 +50,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/energyTrend/struct.go b/iSolarCloud/AppService/energyTrend/struct.go index fc17d5527..5dd90f3e2 100644 --- a/iSolarCloud/AppService/energyTrend/struct.go +++ b/iSolarCloud/AppService/energyTrend/struct.go @@ -5,9 +5,9 @@ package energyTrend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/exportParamSettingValPDF/data.go b/iSolarCloud/AppService/exportParamSettingValPDF/data.go index eacc914d1..eff7a0443 100644 --- a/iSolarCloud/AppService/exportParamSettingValPDF/data.go +++ b/iSolarCloud/AppService/exportParamSettingValPDF/data.go @@ -1,9 +1,9 @@ package exportParamSettingValPDF import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "AppService.exportParamSettingValPDF" type RequestData struct { - TaskId valueTypes.String `json:"task_id" required:"true"` + TaskId valueTypes.String `json:"task_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,10 +25,9 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { Code valueTypes.Integer `json:"code"` - ReturnValPdfURL valueTypes.String `json:"return_val_pdf_url"` + ReturnValPdfURL valueTypes.String `json:"return_val_pdf_url"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/exportParamSettingValPDF/struct.go b/iSolarCloud/AppService/exportParamSettingValPDF/struct.go index 6a90bd460..21d0edcf8 100644 --- a/iSolarCloud/AppService/exportParamSettingValPDF/struct.go +++ b/iSolarCloud/AppService/exportParamSettingValPDF/struct.go @@ -5,9 +5,9 @@ package exportParamSettingValPDF import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/exportPlantReportPDF/data.go b/iSolarCloud/AppService/exportPlantReportPDF/data.go index 56463c959..e171f506a 100644 --- a/iSolarCloud/AppService/exportPlantReportPDF/data.go +++ b/iSolarCloud/AppService/exportPlantReportPDF/data.go @@ -1,9 +1,9 @@ package exportPlantReportPDF import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "AppService.exportPlantReportPDF" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { Code valueTypes.String `json:"code"` } diff --git a/iSolarCloud/AppService/exportPlantReportPDF/struct.go b/iSolarCloud/AppService/exportPlantReportPDF/struct.go index 85690aff4..fbffce274 100644 --- a/iSolarCloud/AppService/exportPlantReportPDF/struct.go +++ b/iSolarCloud/AppService/exportPlantReportPDF/struct.go @@ -5,9 +5,9 @@ package exportPlantReportPDF import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/faultAutoClose/data.go b/iSolarCloud/AppService/faultAutoClose/data.go index e91f47e9d..e62fd2974 100644 --- a/iSolarCloud/AppService/faultAutoClose/data.go +++ b/iSolarCloud/AppService/faultAutoClose/data.go @@ -1,11 +1,12 @@ package faultAutoClose import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/faultAutoClose" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/faultAutoClose/struct.go b/iSolarCloud/AppService/faultAutoClose/struct.go index 9b3d6d1c7..72da873d6 100644 --- a/iSolarCloud/AppService/faultAutoClose/struct.go +++ b/iSolarCloud/AppService/faultAutoClose/struct.go @@ -5,9 +5,9 @@ package faultAutoClose import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go b/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go index 778e8ead0..aad75cea0 100644 --- a/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go +++ b/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go @@ -1,11 +1,12 @@ package faultCloseRemindOrderHandler import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/faultCloseRemindOrderHandler" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go b/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go index 3505375d9..67acecb64 100644 --- a/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go +++ b/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go @@ -5,9 +5,9 @@ package faultCloseRemindOrderHandler import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findCodeValueList/data.go b/iSolarCloud/AppService/findCodeValueList/data.go index 9d9f66b0d..0c5d82aa5 100644 --- a/iSolarCloud/AppService/findCodeValueList/data.go +++ b/iSolarCloud/AppService/findCodeValueList/data.go @@ -1,11 +1,12 @@ package findCodeValueList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findCodeValueList/struct.go b/iSolarCloud/AppService/findCodeValueList/struct.go index 821049d80..387e30fa3 100644 --- a/iSolarCloud/AppService/findCodeValueList/struct.go +++ b/iSolarCloud/AppService/findCodeValueList/struct.go @@ -5,9 +5,9 @@ package findCodeValueList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findEmgOrgInfo/data.go b/iSolarCloud/AppService/findEmgOrgInfo/data.go index e164cdc4d..9b4d9ae34 100644 --- a/iSolarCloud/AppService/findEmgOrgInfo/data.go +++ b/iSolarCloud/AppService/findEmgOrgInfo/data.go @@ -1,11 +1,12 @@ package findEmgOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/findEmgOrgInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findEmgOrgInfo/struct.go b/iSolarCloud/AppService/findEmgOrgInfo/struct.go index 652b70a09..7950c848a 100644 --- a/iSolarCloud/AppService/findEmgOrgInfo/struct.go +++ b/iSolarCloud/AppService/findEmgOrgInfo/struct.go @@ -5,9 +5,9 @@ package findEmgOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findEnvironmentInfo/data.go b/iSolarCloud/AppService/findEnvironmentInfo/data.go index 42b5edfeb..f212ae6d8 100644 --- a/iSolarCloud/AppService/findEnvironmentInfo/data.go +++ b/iSolarCloud/AppService/findEnvironmentInfo/data.go @@ -1,11 +1,12 @@ package findEnvironmentInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -14,7 +15,7 @@ const Disabled = false const EndPointName = "AppService.findEnvironmentInfo" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findEnvironmentInfo/struct.go b/iSolarCloud/AppService/findEnvironmentInfo/struct.go index 801910af9..614d855db 100644 --- a/iSolarCloud/AppService/findEnvironmentInfo/struct.go +++ b/iSolarCloud/AppService/findEnvironmentInfo/struct.go @@ -5,9 +5,9 @@ package findEnvironmentInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findFromHbaseAndRedis/data.go b/iSolarCloud/AppService/findFromHbaseAndRedis/data.go index 2005a1098..97dc0066e 100644 --- a/iSolarCloud/AppService/findFromHbaseAndRedis/data.go +++ b/iSolarCloud/AppService/findFromHbaseAndRedis/data.go @@ -1,11 +1,12 @@ package findFromHbaseAndRedis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/findFromHbaseAndRedis" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go b/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go index f51de4379..99945eb8e 100644 --- a/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go +++ b/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go @@ -5,9 +5,9 @@ package findFromHbaseAndRedis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findInfoByuuid/data.go b/iSolarCloud/AppService/findInfoByuuid/data.go index 54effaa3e..235b1e13d 100644 --- a/iSolarCloud/AppService/findInfoByuuid/data.go +++ b/iSolarCloud/AppService/findInfoByuuid/data.go @@ -1,11 +1,12 @@ package findInfoByuuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/findInfoByuuid" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findInfoByuuid/struct.go b/iSolarCloud/AppService/findInfoByuuid/struct.go index b9fff14c8..caad8c2f3 100644 --- a/iSolarCloud/AppService/findInfoByuuid/struct.go +++ b/iSolarCloud/AppService/findInfoByuuid/struct.go @@ -5,9 +5,9 @@ package findInfoByuuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findLossAnalysisList/data.go b/iSolarCloud/AppService/findLossAnalysisList/data.go index 5ba531c4e..fe17cde40 100644 --- a/iSolarCloud/AppService/findLossAnalysisList/data.go +++ b/iSolarCloud/AppService/findLossAnalysisList/data.go @@ -1,11 +1,12 @@ package findLossAnalysisList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/findLossAnalysisList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findLossAnalysisList/struct.go b/iSolarCloud/AppService/findLossAnalysisList/struct.go index 69aa2ed8f..0a2683340 100644 --- a/iSolarCloud/AppService/findLossAnalysisList/struct.go +++ b/iSolarCloud/AppService/findLossAnalysisList/struct.go @@ -5,9 +5,9 @@ package findLossAnalysisList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findOnDutyInfo/data.go b/iSolarCloud/AppService/findOnDutyInfo/data.go index 90c43e874..8c4859eb3 100644 --- a/iSolarCloud/AppService/findOnDutyInfo/data.go +++ b/iSolarCloud/AppService/findOnDutyInfo/data.go @@ -1,11 +1,12 @@ package findOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/findOnDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findOnDutyInfo/struct.go b/iSolarCloud/AppService/findOnDutyInfo/struct.go index ac9c75779..5c5cabf0e 100644 --- a/iSolarCloud/AppService/findOnDutyInfo/struct.go +++ b/iSolarCloud/AppService/findOnDutyInfo/struct.go @@ -5,9 +5,9 @@ package findOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findPsType/data.go b/iSolarCloud/AppService/findPsType/data.go index a5750e4c0..b8cbd626d 100644 --- a/iSolarCloud/AppService/findPsType/data.go +++ b/iSolarCloud/AppService/findPsType/data.go @@ -1,10 +1,11 @@ package findPsType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/findPsType/struct.go b/iSolarCloud/AppService/findPsType/struct.go index e6ccfbdba..b67417696 100644 --- a/iSolarCloud/AppService/findPsType/struct.go +++ b/iSolarCloud/AppService/findPsType/struct.go @@ -5,9 +5,9 @@ package findPsType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findSingleStationPR/data.go b/iSolarCloud/AppService/findSingleStationPR/data.go index cf680027b..d335987b9 100644 --- a/iSolarCloud/AppService/findSingleStationPR/data.go +++ b/iSolarCloud/AppService/findSingleStationPR/data.go @@ -1,11 +1,12 @@ package findSingleStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/findSingleStationPR" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findSingleStationPR/struct.go b/iSolarCloud/AppService/findSingleStationPR/struct.go index c18c52c15..29f33eef6 100644 --- a/iSolarCloud/AppService/findSingleStationPR/struct.go +++ b/iSolarCloud/AppService/findSingleStationPR/struct.go @@ -5,9 +5,9 @@ package findSingleStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/findUserPassword/data.go b/iSolarCloud/AppService/findUserPassword/data.go index bf2df17a8..3c839d3cb 100644 --- a/iSolarCloud/AppService/findUserPassword/data.go +++ b/iSolarCloud/AppService/findUserPassword/data.go @@ -1,11 +1,12 @@ package findUserPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/findUserPassword" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/findUserPassword/struct.go b/iSolarCloud/AppService/findUserPassword/struct.go index a7650a6c4..2d7c936f1 100644 --- a/iSolarCloud/AppService/findUserPassword/struct.go +++ b/iSolarCloud/AppService/findUserPassword/struct.go @@ -5,9 +5,9 @@ package findUserPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go b/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go index 13af227e9..1f9f39531 100644 --- a/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go +++ b/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go @@ -1,11 +1,12 @@ package genTLSUserSigByUserAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/genTLSUserSigByUserAccount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go b/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go index ae6a88af1..9188a3f82 100644 --- a/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go +++ b/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go @@ -5,9 +5,9 @@ package genTLSUserSigByUserAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/generateRandomPassword/data.go b/iSolarCloud/AppService/generateRandomPassword/data.go index 54e441e99..db0ae9b48 100644 --- a/iSolarCloud/AppService/generateRandomPassword/data.go +++ b/iSolarCloud/AppService/generateRandomPassword/data.go @@ -1,11 +1,12 @@ package generateRandomPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/generateRandomPassword" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/generateRandomPassword/struct.go b/iSolarCloud/AppService/generateRandomPassword/struct.go index c1227d174..99f0a0a6d 100644 --- a/iSolarCloud/AppService/generateRandomPassword/struct.go +++ b/iSolarCloud/AppService/generateRandomPassword/struct.go @@ -5,9 +5,9 @@ package generateRandomPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAPIServiceInfo/data.go b/iSolarCloud/AppService/getAPIServiceInfo/data.go index ecd136ca2..7f0716583 100644 --- a/iSolarCloud/AppService/getAPIServiceInfo/data.go +++ b/iSolarCloud/AppService/getAPIServiceInfo/data.go @@ -1,10 +1,11 @@ package getAPIServiceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { ServiceVersion valueTypes.String `json:"service_version"` } diff --git a/iSolarCloud/AppService/getAPIServiceInfo/struct.go b/iSolarCloud/AppService/getAPIServiceInfo/struct.go index 375b14ebe..7f09d4d14 100644 --- a/iSolarCloud/AppService/getAPIServiceInfo/struct.go +++ b/iSolarCloud/AppService/getAPIServiceInfo/struct.go @@ -5,9 +5,9 @@ package getAPIServiceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAccessedPermission/data.go b/iSolarCloud/AppService/getAccessedPermission/data.go index a7a9aa286..b10449f43 100644 --- a/iSolarCloud/AppService/getAccessedPermission/data.go +++ b/iSolarCloud/AppService/getAccessedPermission/data.go @@ -1,11 +1,12 @@ package getAccessedPermission import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getAccessedPermission" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getAccessedPermission/struct.go b/iSolarCloud/AppService/getAccessedPermission/struct.go index a63c7675f..79290111c 100644 --- a/iSolarCloud/AppService/getAccessedPermission/struct.go +++ b/iSolarCloud/AppService/getAccessedPermission/struct.go @@ -5,9 +5,9 @@ package getAccessedPermission import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAllDeviceByPsId/data.go b/iSolarCloud/AppService/getAllDeviceByPsId/data.go index fd00d8552..f10e3db26 100644 --- a/iSolarCloud/AppService/getAllDeviceByPsId/data.go +++ b/iSolarCloud/AppService/getAllDeviceByPsId/data.go @@ -1,11 +1,12 @@ package getAllDeviceByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getAllDeviceByPsId/struct.go b/iSolarCloud/AppService/getAllDeviceByPsId/struct.go index 8f3fafd36..46e14939d 100644 --- a/iSolarCloud/AppService/getAllDeviceByPsId/struct.go +++ b/iSolarCloud/AppService/getAllDeviceByPsId/struct.go @@ -5,9 +5,9 @@ package getAllDeviceByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go b/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go index 98e13a8cc..fa2b6978f 100644 --- a/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go +++ b/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go @@ -1,11 +1,12 @@ package getAllPowerDeviceSetName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getAllPowerDeviceSetName" @@ -25,9 +26,9 @@ func (rd RequestData) Help() string { } type ResultData []struct { - Remark valueTypes.String `json:"remark"` - SetId valueTypes.Integer `json:"set_id"` - SetName valueTypes.String `json:"set_name"` + Remark valueTypes.String `json:"remark"` + SetId valueTypes.Integer `json:"set_id"` + SetName valueTypes.String `json:"set_name"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go b/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go index 1185e14f0..9cd5af71d 100644 --- a/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go +++ b/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go @@ -5,9 +5,9 @@ package getAllPowerDeviceSetName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go index 98d4ef38b..33c346e8e 100644 --- a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go +++ b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go @@ -1,10 +1,11 @@ package getAllPowerRobotViewInfoByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "AppService.getAllPowerRobotViewInfoByPsId" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { ViewInfoList []interface{} `json:"viewInfoList"` } diff --git a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go index 59b287264..454cd2af1 100644 --- a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go +++ b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go @@ -5,9 +5,9 @@ package getAllPowerRobotViewInfoByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go b/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go index fb2a7e24b..daaf92d36 100644 --- a/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go +++ b/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go @@ -1,10 +1,11 @@ package getAllPsIdByOrgIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []string func (e *ResultData) IsValid() error { @@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap { // pkg := reflection.GetName("", *e) // dt := valueTypes.NewDateTime(valueTypes.Now) // name := pkg + "." + e.Request.OrgIds.String() - entries.StructToDataMap(*e, e.Request.OrgIds.String(), GoStruct.NewEndPointPath(e.Request.OrgIds.String())) + entries.StructToDataMap(*e, e.Request.OrgIds.String(), GoStruct.NewEndPointPath(e.Request.OrgIds.String())) } return entries diff --git a/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go b/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go index 6557c82c6..94cfa1a93 100644 --- a/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go +++ b/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go @@ -5,9 +5,9 @@ package getAllPsIdByOrgIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAllUserRemindCount/data.go b/iSolarCloud/AppService/getAllUserRemindCount/data.go index 2a7e8ab92..518233a85 100644 --- a/iSolarCloud/AppService/getAllUserRemindCount/data.go +++ b/iSolarCloud/AppService/getAllUserRemindCount/data.go @@ -1,9 +1,10 @@ package getAllUserRemindCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,7 +24,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { } diff --git a/iSolarCloud/AppService/getAllUserRemindCount/struct.go b/iSolarCloud/AppService/getAllUserRemindCount/struct.go index 9a4852589..24ba1f57a 100644 --- a/iSolarCloud/AppService/getAllUserRemindCount/struct.go +++ b/iSolarCloud/AppService/getAllUserRemindCount/struct.go @@ -5,9 +5,9 @@ package getAllUserRemindCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAndOutletsAndUnit/data.go b/iSolarCloud/AppService/getAndOutletsAndUnit/data.go index 1a2d40e9c..a84a9dc60 100644 --- a/iSolarCloud/AppService/getAndOutletsAndUnit/data.go +++ b/iSolarCloud/AppService/getAndOutletsAndUnit/data.go @@ -1,11 +1,12 @@ package getAndOutletsAndUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getAndOutletsAndUnit" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go b/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go index d7ba9c933..aad48cc03 100644 --- a/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go +++ b/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go @@ -5,9 +5,9 @@ package getAndOutletsAndUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getApiCallsForAppkeys/data.go b/iSolarCloud/AppService/getApiCallsForAppkeys/data.go index f3ceffa5b..bd661ec83 100644 --- a/iSolarCloud/AppService/getApiCallsForAppkeys/data.go +++ b/iSolarCloud/AppService/getApiCallsForAppkeys/data.go @@ -1,8 +1,8 @@ package getApiCallsForAppkeys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { } @@ -32,7 +31,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, "", GoStruct.EndPointPath{}) diff --git a/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go b/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go index 14f77d205..ecebabad4 100644 --- a/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go +++ b/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go @@ -5,9 +5,9 @@ package getApiCallsForAppkeys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go b/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go index 4befb8f8c..33bbaf1b1 100644 --- a/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go +++ b/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go @@ -1,11 +1,12 @@ package getAreaInfoCodeByCounty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getAreaInfoCodeByCounty" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go b/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go index dccc0b40f..264c091fb 100644 --- a/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go +++ b/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go @@ -5,9 +5,9 @@ package getAreaInfoCodeByCounty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAreaList/data.go b/iSolarCloud/AppService/getAreaList/data.go index a02689839..ff440cc94 100644 --- a/iSolarCloud/AppService/getAreaList/data.go +++ b/iSolarCloud/AppService/getAreaList/data.go @@ -1,10 +1,11 @@ package getAreaList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,7 @@ func (rd RequestData) Help() string { type ResultData struct { PageList []struct { - GoStruct.GoStructParent `json:"-" PointIdFromChild:"OrgId" PointIdReplace:"true"` + GoStruct.GoStructParent `json:"-" PointIdFromChild:"OrgId" PointIdReplace:"true"` OrgId valueTypes.Integer `json:"org_id"` OrgName valueTypes.String `json:"org_name"` diff --git a/iSolarCloud/AppService/getAreaList/struct.go b/iSolarCloud/AppService/getAreaList/struct.go index 52eb33b03..f02c730e9 100644 --- a/iSolarCloud/AppService/getAreaList/struct.go +++ b/iSolarCloud/AppService/getAreaList/struct.go @@ -5,9 +5,9 @@ package getAreaList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getAutoCreatePowerStation/data.go b/iSolarCloud/AppService/getAutoCreatePowerStation/data.go index 68e75560e..6e5d3b358 100644 --- a/iSolarCloud/AppService/getAutoCreatePowerStation/data.go +++ b/iSolarCloud/AppService/getAutoCreatePowerStation/data.go @@ -1,11 +1,12 @@ package getAutoCreatePowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getAutoCreatePowerStation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go b/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go index 6c9f8a679..98b5c5fb9 100644 --- a/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go +++ b/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go @@ -5,9 +5,9 @@ package getAutoCreatePowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getBackReadValue/data.go b/iSolarCloud/AppService/getBackReadValue/data.go index 0c75c4485..a4c00c29e 100644 --- a/iSolarCloud/AppService/getBackReadValue/data.go +++ b/iSolarCloud/AppService/getBackReadValue/data.go @@ -1,11 +1,12 @@ package getBackReadValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getBackReadValue" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getBackReadValue/struct.go b/iSolarCloud/AppService/getBackReadValue/struct.go index f019c3586..4c99d0c14 100644 --- a/iSolarCloud/AppService/getBackReadValue/struct.go +++ b/iSolarCloud/AppService/getBackReadValue/struct.go @@ -5,9 +5,9 @@ package getBackReadValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getBatchNewestPointData/data.go b/iSolarCloud/AppService/getBatchNewestPointData/data.go index 2992a3239..a5a102de5 100644 --- a/iSolarCloud/AppService/getBatchNewestPointData/data.go +++ b/iSolarCloud/AppService/getBatchNewestPointData/data.go @@ -1,9 +1,9 @@ package getBatchNewestPointData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -27,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } @@ -36,7 +35,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, "", GoStruct.EndPointPath{}) diff --git a/iSolarCloud/AppService/getBatchNewestPointData/struct.go b/iSolarCloud/AppService/getBatchNewestPointData/struct.go index 10b13f566..4b821355e 100644 --- a/iSolarCloud/AppService/getBatchNewestPointData/struct.go +++ b/iSolarCloud/AppService/getBatchNewestPointData/struct.go @@ -5,9 +5,9 @@ package getBatchNewestPointData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCallApiResidueTimes/data.go b/iSolarCloud/AppService/getCallApiResidueTimes/data.go index 7f8d0ee16..58c57a4e0 100644 --- a/iSolarCloud/AppService/getCallApiResidueTimes/data.go +++ b/iSolarCloud/AppService/getCallApiResidueTimes/data.go @@ -1,11 +1,12 @@ package getCallApiResidueTimes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCallApiResidueTimes" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCallApiResidueTimes/struct.go b/iSolarCloud/AppService/getCallApiResidueTimes/struct.go index ad352852c..c9ce29f6d 100644 --- a/iSolarCloud/AppService/getCallApiResidueTimes/struct.go +++ b/iSolarCloud/AppService/getCallApiResidueTimes/struct.go @@ -5,9 +5,9 @@ package getCallApiResidueTimes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getChangedPsListByTime/data.go b/iSolarCloud/AppService/getChangedPsListByTime/data.go index 8395adda0..bf13c295f 100644 --- a/iSolarCloud/AppService/getChangedPsListByTime/data.go +++ b/iSolarCloud/AppService/getChangedPsListByTime/data.go @@ -1,11 +1,12 @@ package getChangedPsListByTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getChangedPsListByTime" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getChangedPsListByTime/struct.go b/iSolarCloud/AppService/getChangedPsListByTime/struct.go index 424ced523..0f9ce7bf5 100644 --- a/iSolarCloud/AppService/getChangedPsListByTime/struct.go +++ b/iSolarCloud/AppService/getChangedPsListByTime/struct.go @@ -5,9 +5,9 @@ package getChangedPsListByTime import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getChnnlListByPsId/data.go b/iSolarCloud/AppService/getChnnlListByPsId/data.go index d33caab0a..987a48e01 100644 --- a/iSolarCloud/AppService/getChnnlListByPsId/data.go +++ b/iSolarCloud/AppService/getChnnlListByPsId/data.go @@ -1,10 +1,11 @@ package getChnnlListByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getChnnlListByPsId" @@ -26,7 +27,7 @@ func (rd RequestData) Help() string { type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true" PointIdReplace:"true"` PsId valueTypes.Integer `json:"ps_id"` Sn valueTypes.String `json:"sn"` diff --git a/iSolarCloud/AppService/getChnnlListByPsId/struct.go b/iSolarCloud/AppService/getChnnlListByPsId/struct.go index a395259f2..c70d963cc 100644 --- a/iSolarCloud/AppService/getChnnlListByPsId/struct.go +++ b/iSolarCloud/AppService/getChnnlListByPsId/struct.go @@ -5,9 +5,9 @@ package getChnnlListByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCloudList/data.go b/iSolarCloud/AppService/getCloudList/data.go index 95c8c7018..20fb8f79e 100644 --- a/iSolarCloud/AppService/getCloudList/data.go +++ b/iSolarCloud/AppService/getCloudList/data.go @@ -1,11 +1,12 @@ package getCloudList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCloudList" @@ -26,52 +27,52 @@ func (rd RequestData) Help() string { type ResultData struct { CloudList []struct { - CloudId valueTypes.Integer `json:"cloud_id"` - CloudName valueTypes.String `json:"cloud_name"` - GatewayURL valueTypes.String `json:"gateway_url"` - OrderId valueTypes.Integer `json:"order_id"` - ServiceURL valueTypes.String `json:"service_url"` - Value valueTypes.String `json:"value"` - ValueDeDe valueTypes.String `json:"value_de_de"` - ValueEnUs valueTypes.String `json:"value_en_us"` - ValueEsEs valueTypes.String `json:"value_es_es"` - ValueFrFr valueTypes.String `json:"value_fr_fr"` - ValueItIt valueTypes.String `json:"value_it_it"` - ValueJaJp valueTypes.String `json:"value_ja_jp"` - ValueKoKr valueTypes.String `json:"value_ko_kr"` - ValueNlNl valueTypes.String `json:"value_nl_nl"` - ValuePlPl valueTypes.String `json:"value_pl_pl"` - ValuePtBr valueTypes.String `json:"value_pt_br"` - ValuePtPt valueTypes.String `json:"value_pt_pt"` - ValueTrTr valueTypes.String `json:"value_tr_tr"` - ValueViVn valueTypes.String `json:"value_vi_vn"` - ValueZhCn valueTypes.String `json:"value_zh_cn"` - ValueZhTw valueTypes.String `json:"value_zh_tw"` - WebURL valueTypes.String `json:"web_url"` + CloudId valueTypes.Integer `json:"cloud_id"` + CloudName valueTypes.String `json:"cloud_name"` + GatewayURL valueTypes.String `json:"gateway_url"` + OrderId valueTypes.Integer `json:"order_id"` + ServiceURL valueTypes.String `json:"service_url"` + Value valueTypes.String `json:"value"` + ValueDeDe valueTypes.String `json:"value_de_de"` + ValueEnUs valueTypes.String `json:"value_en_us"` + ValueEsEs valueTypes.String `json:"value_es_es"` + ValueFrFr valueTypes.String `json:"value_fr_fr"` + ValueItIt valueTypes.String `json:"value_it_it"` + ValueJaJp valueTypes.String `json:"value_ja_jp"` + ValueKoKr valueTypes.String `json:"value_ko_kr"` + ValueNlNl valueTypes.String `json:"value_nl_nl"` + ValuePlPl valueTypes.String `json:"value_pl_pl"` + ValuePtBr valueTypes.String `json:"value_pt_br"` + ValuePtPt valueTypes.String `json:"value_pt_pt"` + ValueTrTr valueTypes.String `json:"value_tr_tr"` + ValueViVn valueTypes.String `json:"value_vi_vn"` + ValueZhCn valueTypes.String `json:"value_zh_cn"` + ValueZhTw valueTypes.String `json:"value_zh_tw"` + WebURL valueTypes.String `json:"web_url"` } `json:"cloud_list" DataTable:"true"` CurrentCloud struct { - CloudId valueTypes.Integer `json:"cloud_id"` - CloudName valueTypes.String `json:"cloud_name"` - GatewayURL valueTypes.String `json:"gateway_url"` - OrderId valueTypes.Integer `json:"order_id"` - ServiceURL valueTypes.String `json:"service_url"` - Value valueTypes.String `json:"value"` - ValueDeDe valueTypes.String `json:"value_de_de"` - ValueEnUs valueTypes.String `json:"value_en_us"` - ValueEsEs valueTypes.String `json:"value_es_es"` - ValueFrFr valueTypes.String `json:"value_fr_fr"` - ValueItIt valueTypes.String `json:"value_it_it"` - ValueJaJp valueTypes.String `json:"value_ja_jp"` - ValueKoKr valueTypes.String `json:"value_ko_kr"` - ValueNlNl valueTypes.String `json:"value_nl_nl"` - ValuePlPl valueTypes.String `json:"value_pl_pl"` - ValuePtBr valueTypes.String `json:"value_pt_br"` - ValuePtPt valueTypes.String `json:"value_pt_pt"` - ValueTrTr valueTypes.String `json:"value_tr_tr"` - ValueViVn valueTypes.String `json:"value_vi_vn"` - ValueZhCn valueTypes.String `json:"value_zh_cn"` - ValueZhTw valueTypes.String `json:"value_zh_tw"` - WebURL valueTypes.String `json:"web_url"` + CloudId valueTypes.Integer `json:"cloud_id"` + CloudName valueTypes.String `json:"cloud_name"` + GatewayURL valueTypes.String `json:"gateway_url"` + OrderId valueTypes.Integer `json:"order_id"` + ServiceURL valueTypes.String `json:"service_url"` + Value valueTypes.String `json:"value"` + ValueDeDe valueTypes.String `json:"value_de_de"` + ValueEnUs valueTypes.String `json:"value_en_us"` + ValueEsEs valueTypes.String `json:"value_es_es"` + ValueFrFr valueTypes.String `json:"value_fr_fr"` + ValueItIt valueTypes.String `json:"value_it_it"` + ValueJaJp valueTypes.String `json:"value_ja_jp"` + ValueKoKr valueTypes.String `json:"value_ko_kr"` + ValueNlNl valueTypes.String `json:"value_nl_nl"` + ValuePlPl valueTypes.String `json:"value_pl_pl"` + ValuePtBr valueTypes.String `json:"value_pt_br"` + ValuePtPt valueTypes.String `json:"value_pt_pt"` + ValueTrTr valueTypes.String `json:"value_tr_tr"` + ValueViVn valueTypes.String `json:"value_vi_vn"` + ValueZhCn valueTypes.String `json:"value_zh_cn"` + ValueZhTw valueTypes.String `json:"value_zh_tw"` + WebURL valueTypes.String `json:"web_url"` } `json:"current_cloud"` } diff --git a/iSolarCloud/AppService/getCloudList/struct.go b/iSolarCloud/AppService/getCloudList/struct.go index 67c5c4072..1168f18ba 100644 --- a/iSolarCloud/AppService/getCloudList/struct.go +++ b/iSolarCloud/AppService/getCloudList/struct.go @@ -5,9 +5,9 @@ package getCloudList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go b/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go index 8272c89a1..1630f53b2 100644 --- a/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go +++ b/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go @@ -1,11 +1,12 @@ package getCloudServiceMappingConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCloudServiceMappingConfig" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go b/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go index 837633347..6932c4970 100644 --- a/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go +++ b/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go @@ -5,9 +5,9 @@ package getCloudServiceMappingConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go index fdf3bca8c..7ef1969cc 100644 --- a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go +++ b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go @@ -1,10 +1,11 @@ package getCommunicationDeviceConfigInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getCommunicationDeviceConfigInfo" @@ -23,10 +24,9 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"TypeId"` - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TypeId" PointIdReplace:"false"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"TypeId"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TypeId" PointIdReplace:"false"` TypeId valueTypes.Integer `json:"type_id"` DeviceName valueTypes.String `json:"device_name"` diff --git a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go index aa3e58036..3c64ea227 100644 --- a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go +++ b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go @@ -5,9 +5,9 @@ package getCommunicationDeviceConfigInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go b/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go index 5b6ba9285..8e0683806 100644 --- a/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go +++ b/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go @@ -1,11 +1,12 @@ package getCommunicationModuleMonitorData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getCommunicationModuleMonitorData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go b/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go index e9a3f2044..446463fba 100644 --- a/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go +++ b/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go @@ -5,9 +5,9 @@ package getCommunicationModuleMonitorData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getComponentModelFactory/data.go b/iSolarCloud/AppService/getComponentModelFactory/data.go index 505776c8a..ef701f7fa 100644 --- a/iSolarCloud/AppService/getComponentModelFactory/data.go +++ b/iSolarCloud/AppService/getComponentModelFactory/data.go @@ -1,11 +1,12 @@ package getComponentModelFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getComponentModelFactory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getComponentModelFactory/struct.go b/iSolarCloud/AppService/getComponentModelFactory/struct.go index 62c2da833..ababbaa87 100644 --- a/iSolarCloud/AppService/getComponentModelFactory/struct.go +++ b/iSolarCloud/AppService/getComponentModelFactory/struct.go @@ -5,9 +5,9 @@ package getComponentModelFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getConfigList/data.go b/iSolarCloud/AppService/getConfigList/data.go index 22bccd95e..b7d0c12e9 100644 --- a/iSolarCloud/AppService/getConfigList/data.go +++ b/iSolarCloud/AppService/getConfigList/data.go @@ -1,11 +1,12 @@ package getConfigList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/getConfigList" diff --git a/iSolarCloud/AppService/getConfigList/struct.go b/iSolarCloud/AppService/getConfigList/struct.go index 65d2a1511..0344b2c85 100644 --- a/iSolarCloud/AppService/getConfigList/struct.go +++ b/iSolarCloud/AppService/getConfigList/struct.go @@ -5,9 +5,9 @@ package getConfigList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go index 587d9bbc1..aa1922a24 100644 --- a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go +++ b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go @@ -1,11 +1,12 @@ package getConnectionInfoBySnAndLocalPort import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getConnectionInfoBySnAndLocalPort" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go index ad9841bd2..9f5da977e 100644 --- a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go +++ b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go @@ -5,9 +5,9 @@ package getConnectionInfoBySnAndLocalPort import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCountDown/data.go b/iSolarCloud/AppService/getCountDown/data.go index 9101a4c2c..7d2c038fe 100644 --- a/iSolarCloud/AppService/getCountDown/data.go +++ b/iSolarCloud/AppService/getCountDown/data.go @@ -1,11 +1,12 @@ package getCountDown import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getCountDown" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCountDown/struct.go b/iSolarCloud/AppService/getCountDown/struct.go index 2ad07da0a..1816e7c9a 100644 --- a/iSolarCloud/AppService/getCountDown/struct.go +++ b/iSolarCloud/AppService/getCountDown/struct.go @@ -5,9 +5,9 @@ package getCountDown import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCountryServiceInfo/data.go b/iSolarCloud/AppService/getCountryServiceInfo/data.go index ff0eb86a1..a41b0db53 100644 --- a/iSolarCloud/AppService/getCountryServiceInfo/data.go +++ b/iSolarCloud/AppService/getCountryServiceInfo/data.go @@ -1,11 +1,12 @@ package getCountryServiceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCountryServiceInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCountryServiceInfo/struct.go b/iSolarCloud/AppService/getCountryServiceInfo/struct.go index 691fe8caf..1df4c9ed3 100644 --- a/iSolarCloud/AppService/getCountryServiceInfo/struct.go +++ b/iSolarCloud/AppService/getCountryServiceInfo/struct.go @@ -5,9 +5,9 @@ package getCountryServiceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCounty/data.go b/iSolarCloud/AppService/getCounty/data.go index 90983ba5d..e2e33740b 100644 --- a/iSolarCloud/AppService/getCounty/data.go +++ b/iSolarCloud/AppService/getCounty/data.go @@ -1,11 +1,12 @@ package getCounty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCounty" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCounty/struct.go b/iSolarCloud/AppService/getCounty/struct.go index 198590b72..8ec55ec9d 100644 --- a/iSolarCloud/AppService/getCounty/struct.go +++ b/iSolarCloud/AppService/getCounty/struct.go @@ -5,9 +5,9 @@ package getCounty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCustomerEmployee/data.go b/iSolarCloud/AppService/getCustomerEmployee/data.go index cff271bc8..e84db284b 100644 --- a/iSolarCloud/AppService/getCustomerEmployee/data.go +++ b/iSolarCloud/AppService/getCustomerEmployee/data.go @@ -1,11 +1,12 @@ package getCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getCustomerEmployee" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getCustomerEmployee/struct.go b/iSolarCloud/AppService/getCustomerEmployee/struct.go index f89ccc4cb..3689af83f 100644 --- a/iSolarCloud/AppService/getCustomerEmployee/struct.go +++ b/iSolarCloud/AppService/getCustomerEmployee/struct.go @@ -5,9 +5,9 @@ package getCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getCustomerList/data.go b/iSolarCloud/AppService/getCustomerList/data.go index b6c007eec..f609e0b65 100644 --- a/iSolarCloud/AppService/getCustomerList/data.go +++ b/iSolarCloud/AppService/getCustomerList/data.go @@ -1,10 +1,11 @@ package getCustomerList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,13 +25,12 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CustomerCode"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CustomerCode"` - CustomerCode valueTypes.String `json:"customer_code"` - CustomerName valueTypes.String `json:"customer_name"` - FactoryId valueTypes.Integer `json:"factory_id"` + CustomerCode valueTypes.String `json:"customer_code"` + CustomerName valueTypes.String `json:"customer_name"` + FactoryId valueTypes.Integer `json:"factory_id"` } func (e *ResultData) IsValid() error { @@ -38,7 +38,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/getCustomerList/struct.go b/iSolarCloud/AppService/getCustomerList/struct.go index 5a756f0d4..6f0b43692 100644 --- a/iSolarCloud/AppService/getCustomerList/struct.go +++ b/iSolarCloud/AppService/getCustomerList/struct.go @@ -5,9 +5,9 @@ package getCustomerList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDataFromHBase/data.go b/iSolarCloud/AppService/getDataFromHBase/data.go index 1c6554a0e..04d259245 100644 --- a/iSolarCloud/AppService/getDataFromHBase/data.go +++ b/iSolarCloud/AppService/getDataFromHBase/data.go @@ -1,11 +1,12 @@ package getDataFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getDataFromHBase" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDataFromHBase/struct.go b/iSolarCloud/AppService/getDataFromHBase/struct.go index 05ffa6512..6b3c41eb3 100644 --- a/iSolarCloud/AppService/getDataFromHBase/struct.go +++ b/iSolarCloud/AppService/getDataFromHBase/struct.go @@ -5,9 +5,9 @@ package getDataFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go b/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go index f67eeecf1..196271852 100644 --- a/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go +++ b/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go @@ -1,11 +1,12 @@ package getDataFromHbaseByRowKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getDataFromHbaseByRowKey" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go b/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go index 461b1adce..db79b9cb1 100644 --- a/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go +++ b/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go @@ -5,9 +5,9 @@ package getDataFromHbaseByRowKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go b/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go index 32a3bfc82..af4a09a4f 100644 --- a/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go +++ b/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go @@ -1,9 +1,9 @@ package getDevInstalledPowerByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go b/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go index 7a039f18a..4e3be5103 100644 --- a/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go +++ b/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go @@ -5,9 +5,9 @@ package getDevInstalledPowerByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevRecord/data.go b/iSolarCloud/AppService/getDevRecord/data.go index d5faa7748..60ccf2bf6 100644 --- a/iSolarCloud/AppService/getDevRecord/data.go +++ b/iSolarCloud/AppService/getDevRecord/data.go @@ -1,10 +1,11 @@ package getDevRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/AppService/getDevRecord/struct.go b/iSolarCloud/AppService/getDevRecord/struct.go index 029278d8e..aa5f0f7b4 100644 --- a/iSolarCloud/AppService/getDevRecord/struct.go +++ b/iSolarCloud/AppService/getDevRecord/struct.go @@ -5,9 +5,9 @@ package getDevRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevRunRecordList/data.go b/iSolarCloud/AppService/getDevRunRecordList/data.go index da893263d..e923aa976 100644 --- a/iSolarCloud/AppService/getDevRunRecordList/data.go +++ b/iSolarCloud/AppService/getDevRunRecordList/data.go @@ -1,11 +1,12 @@ package getDevRunRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevRunRecordList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDevRunRecordList/struct.go b/iSolarCloud/AppService/getDevRunRecordList/struct.go index 7a1cf486a..ca94be37c 100644 --- a/iSolarCloud/AppService/getDevRunRecordList/struct.go +++ b/iSolarCloud/AppService/getDevRunRecordList/struct.go @@ -5,9 +5,9 @@ package getDevRunRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevSimByList/data.go b/iSolarCloud/AppService/getDevSimByList/data.go index 4debabd44..a36079f68 100644 --- a/iSolarCloud/AppService/getDevSimByList/data.go +++ b/iSolarCloud/AppService/getDevSimByList/data.go @@ -1,11 +1,12 @@ package getDevSimByList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevSimByList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDevSimByList/struct.go b/iSolarCloud/AppService/getDevSimByList/struct.go index 7b0188884..fbf0e2db5 100644 --- a/iSolarCloud/AppService/getDevSimByList/struct.go +++ b/iSolarCloud/AppService/getDevSimByList/struct.go @@ -5,9 +5,9 @@ package getDevSimByList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevSimList/data.go b/iSolarCloud/AppService/getDevSimList/data.go index 90232c129..e0675557a 100644 --- a/iSolarCloud/AppService/getDevSimList/data.go +++ b/iSolarCloud/AppService/getDevSimList/data.go @@ -1,11 +1,12 @@ package getDevSimList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevSimList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDevSimList/struct.go b/iSolarCloud/AppService/getDevSimList/struct.go index cf4fb6aff..ace093b68 100644 --- a/iSolarCloud/AppService/getDevSimList/struct.go +++ b/iSolarCloud/AppService/getDevSimList/struct.go @@ -5,9 +5,9 @@ package getDevSimList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceAccountById/data.go b/iSolarCloud/AppService/getDeviceAccountById/data.go index 093bb7960..02c7f0bea 100644 --- a/iSolarCloud/AppService/getDeviceAccountById/data.go +++ b/iSolarCloud/AppService/getDeviceAccountById/data.go @@ -1,11 +1,12 @@ package getDeviceAccountById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceAccountById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDeviceAccountById/struct.go b/iSolarCloud/AppService/getDeviceAccountById/struct.go index e0bda6499..c44ec68c7 100644 --- a/iSolarCloud/AppService/getDeviceAccountById/struct.go +++ b/iSolarCloud/AppService/getDeviceAccountById/struct.go @@ -5,9 +5,9 @@ package getDeviceAccountById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go b/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go index 677572aea..28b4e02be 100644 --- a/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go +++ b/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go @@ -1,11 +1,12 @@ package getDeviceFaultStatisticsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceFaultStatisticsData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go b/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go index e5d20261b..8dbe8abb2 100644 --- a/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go +++ b/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go @@ -5,9 +5,9 @@ package getDeviceFaultStatisticsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceInfo/data.go b/iSolarCloud/AppService/getDeviceInfo/data.go index 9e7d284ac..bc5fbda05 100644 --- a/iSolarCloud/AppService/getDeviceInfo/data.go +++ b/iSolarCloud/AppService/getDeviceInfo/data.go @@ -1,10 +1,11 @@ package getDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getDeviceInfo/struct.go b/iSolarCloud/AppService/getDeviceInfo/struct.go index d90b9464f..6b31855f2 100644 --- a/iSolarCloud/AppService/getDeviceInfo/struct.go +++ b/iSolarCloud/AppService/getDeviceInfo/struct.go @@ -5,9 +5,9 @@ package getDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go index 298213371..47d9aaa60 100644 --- a/iSolarCloud/AppService/getDeviceList/data.go +++ b/iSolarCloud/AppService/getDeviceList/data.go @@ -1,11 +1,12 @@ package getDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -28,62 +29,62 @@ func (rd RequestData) Help() string { // ResultData - Both getDeviceList & queryDeviceListForApp have the same output. type ResultData struct { - PageList []Device `json:"pageList" PointId:"devices" DataTable:"true" DataTableSortOn:"PsKey"` + PageList []Device `json:"pageList" PointId:"devices" DataTable:"true" DataTableSortOn:"PsKey"` RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } type Device struct { - GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey" PointIdFrom:"PsKey" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey" PointIdFrom:"PsKey" PointIdReplace:"true"` - PsKey valueTypes.PsKey `json:"ps_key"` - PsId valueTypes.PsId `json:"ps_id"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceCode valueTypes.Integer `json:"device_code"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + PsKey valueTypes.PsKey `json:"ps_key"` + PsId valueTypes.PsId `json:"ps_id"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceCode valueTypes.Integer `json:"device_code"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` - Sn valueTypes.String `json:"sn" PointName:"Serial Number"` - FactoryName valueTypes.String `json:"factory_name"` + Sn valueTypes.String `json:"sn" PointName:"Serial Number"` + FactoryName valueTypes.String `json:"factory_name"` - AttrId valueTypes.Integer `json:"attr_id"` - CommandStatus valueTypes.Integer `json:"command_status"` - ConnectState valueTypes.Bool `json:"connect_state"` - DataFlag valueTypes.Integer `json:"data_flag"` - DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` + AttrId valueTypes.Integer `json:"attr_id"` + CommandStatus valueTypes.Integer `json:"command_status"` + ConnectState valueTypes.Bool `json:"connect_state"` + DataFlag valueTypes.Integer `json:"data_flag"` + DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` - DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` - DevStatus valueTypes.Bool `json:"dev_status"` - DeviceArea valueTypes.String `json:"device_area"` - DeviceFactoryDate valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"DateTimeLayout"` - 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"` - DeviceName valueTypes.String `json:"device_name"` - DeviceProSn valueTypes.String `json:"device_pro_sn"` - DeviceState valueTypes.Integer `json:"device_state"` - DeviceSubType interface{} `json:"device_sub_type"` - DeviceSubTypeName interface{} `json:"device_sub_type_name"` + DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` + DevStatus valueTypes.Bool `json:"dev_status"` + DeviceArea valueTypes.String `json:"device_area"` + DeviceFactoryDate valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"DateTimeLayout"` + 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"` + DeviceName valueTypes.String `json:"device_name"` + DeviceProSn valueTypes.String `json:"device_pro_sn"` + DeviceState valueTypes.Integer `json:"device_state"` + DeviceSubType interface{} `json:"device_sub_type"` + DeviceSubTypeName interface{} `json:"device_sub_type_name"` - IsCountryCheck valueTypes.Bool `json:"is_country_check"` - IsHasFunctionEnum valueTypes.Bool `json:"is_has_function_enum"` - IsHasTheAbility valueTypes.Bool `json:"is_has_the_ability"` - IsInit valueTypes.Bool `json:"is_init"` - IsReadSet valueTypes.Bool `json:"is_read_set"` - IsReplacing valueTypes.Bool `json:"is_replacing"` - IsReset valueTypes.Bool `json:"is_reset"` - IsSecond valueTypes.Bool `json:"is_second"` - IsThirdParty valueTypes.Bool `json:"is_third_party"` + IsCountryCheck valueTypes.Bool `json:"is_country_check"` + IsHasFunctionEnum valueTypes.Bool `json:"is_has_function_enum"` + IsHasTheAbility valueTypes.Bool `json:"is_has_the_ability"` + IsInit valueTypes.Bool `json:"is_init"` + IsReadSet valueTypes.Bool `json:"is_read_set"` + IsReplacing valueTypes.Bool `json:"is_replacing"` + IsReset valueTypes.Bool `json:"is_reset"` + IsSecond valueTypes.Bool `json:"is_second"` + IsThirdParty valueTypes.Bool `json:"is_third_party"` - InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` - InverterModelType valueTypes.Integer `json:"inverter_model_type"` - ModuleUUID valueTypes.Integer `json:"module_uuid"` - OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` - P24 interface{} `json:"p24"` - Posx interface{} `json:"posx"` - Posy interface{} `json:"posy"` - RelState valueTypes.Bool `json:"rel_state"` - TypeName valueTypes.String `json:"type_name"` - UUID valueTypes.Integer `json:"uuid"` + InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` + InverterModelType valueTypes.Integer `json:"inverter_model_type"` + ModuleUUID valueTypes.Integer `json:"module_uuid"` + OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` + P24 interface{} `json:"p24"` + Posx interface{} `json:"posx"` + Posy interface{} `json:"posy"` + RelState valueTypes.Bool `json:"rel_state"` + TypeName valueTypes.String `json:"type_name"` + UUID valueTypes.Integer `json:"uuid"` } func (e *ResultData) IsValid() error { @@ -262,7 +263,6 @@ func GetDevicesTable(data Devices) output.Table { return table } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() 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 5e9f065df..1a38eee1f 100644 --- a/iSolarCloud/AppService/getDeviceList/struct.go +++ b/iSolarCloud/AppService/getDeviceList/struct.go @@ -5,9 +5,9 @@ package getDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/data.go b/iSolarCloud/AppService/getDeviceModelInfoList/data.go index d27110045..6e262b005 100644 --- a/iSolarCloud/AppService/getDeviceModelInfoList/data.go +++ b/iSolarCloud/AppService/getDeviceModelInfoList/data.go @@ -1,11 +1,12 @@ package getDeviceModelInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,14 +27,14 @@ func (rd RequestData) Help() string { } type ResultData []struct { - ComType valueTypes.String `json:"com_type"` - DeviceFactoryId valueTypes.String `json:"device_factory_id"` - DeviceFactoryName valueTypes.String `json:"device_factory_name"` - DeviceModel valueTypes.String `json:"device_model"` - DeviceModelCode valueTypes.String `json:"device_model_code"` - DeviceModelId valueTypes.Integer `json:"device_model_id"` - DeviceType valueTypes.Integer `json:"device_type"` - IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` + ComType valueTypes.String `json:"com_type"` + DeviceFactoryId valueTypes.String `json:"device_factory_id"` + DeviceFactoryName valueTypes.String `json:"device_factory_name"` + DeviceModel valueTypes.String `json:"device_model"` + DeviceModelCode valueTypes.String `json:"device_model_code"` + DeviceModelId valueTypes.Integer `json:"device_model_id"` + DeviceType valueTypes.Integer `json:"device_type"` + IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/struct.go b/iSolarCloud/AppService/getDeviceModelInfoList/struct.go index fccaca92b..75b8f8a0b 100644 --- a/iSolarCloud/AppService/getDeviceModelInfoList/struct.go +++ b/iSolarCloud/AppService/getDeviceModelInfoList/struct.go @@ -5,9 +5,9 @@ package getDeviceModelInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go index ff69a8e2e..9f8f2bc48 100644 --- a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go +++ b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go @@ -1,11 +1,12 @@ package getDevicePointMinuteDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -29,7 +30,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { Data []DataPoint `json:"data" PointIdReplace:"false" DataTable:"true" DataTableSortOn:"TimeStamp"` } @@ -51,14 +51,13 @@ func (e *ResultData) UnmarshalJSON(data []byte) error { return err } - type DataPoint struct { - GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateTimeAltLayout" PointTimestampFrom:"TimeStamp"` + GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateTimeAltLayout" PointTimestampFrom:"TimeStamp"` - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeLayout"` - Points map[string]valueTypes.UnitValue `json:"points"` + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeLayout"` + Points map[string]valueTypes.UnitValue `json:"points"` // P13148 valueTypes.Integer `json:"p13148"` - IsPlatformDefaultUnit valueTypes.Bool `json:"is_platform_default_unit"` + IsPlatformDefaultUnit valueTypes.Bool `json:"is_platform_default_unit"` } func (e *DataPoint) UnmarshalJSON(data []byte) error { @@ -83,7 +82,7 @@ func (e *DataPoint) UnmarshalJSON(data []byte) error { break } - d.Points = make(map[string]valueTypes.UnitValue) // @TODO - change to UVS + d.Points = make(map[string]valueTypes.UnitValue) // @TODO - change to UVS for k, v := range mp { if k == "is_platform_default_unit" { continue @@ -109,7 +108,6 @@ func (e *DataPoint) UnmarshalJSON(data []byte) error { return err } - func (e *ResultData) IsValid() error { var err error return err diff --git a/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go b/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go index bc39f00a9..eb68319c6 100644 --- a/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go +++ b/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go @@ -5,9 +5,9 @@ package getDevicePointMinuteDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevicePoints/data.go b/iSolarCloud/AppService/getDevicePoints/data.go index 9af5ff67d..06d92ca31 100644 --- a/iSolarCloud/AppService/getDevicePoints/data.go +++ b/iSolarCloud/AppService/getDevicePoints/data.go @@ -1,10 +1,11 @@ package getDevicePoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getDevicePoints" diff --git a/iSolarCloud/AppService/getDevicePoints/struct.go b/iSolarCloud/AppService/getDevicePoints/struct.go index 58e1406ad..df452169a 100644 --- a/iSolarCloud/AppService/getDevicePoints/struct.go +++ b/iSolarCloud/AppService/getDevicePoints/struct.go @@ -5,9 +5,9 @@ package getDevicePoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDevicePropertys/data.go b/iSolarCloud/AppService/getDevicePropertys/data.go index 5cfd418ed..f9dd01b8f 100644 --- a/iSolarCloud/AppService/getDevicePropertys/data.go +++ b/iSolarCloud/AppService/getDevicePropertys/data.go @@ -1,11 +1,12 @@ package getDevicePropertys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevicePropertys" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDevicePropertys/struct.go b/iSolarCloud/AppService/getDevicePropertys/struct.go index 29972da56..285f1820f 100644 --- a/iSolarCloud/AppService/getDevicePropertys/struct.go +++ b/iSolarCloud/AppService/getDevicePropertys/struct.go @@ -5,9 +5,9 @@ package getDevicePropertys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceRepairDetail/data.go b/iSolarCloud/AppService/getDeviceRepairDetail/data.go index fe6289438..ff23d1773 100644 --- a/iSolarCloud/AppService/getDeviceRepairDetail/data.go +++ b/iSolarCloud/AppService/getDeviceRepairDetail/data.go @@ -1,11 +1,12 @@ package getDeviceRepairDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceRepairDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDeviceRepairDetail/struct.go b/iSolarCloud/AppService/getDeviceRepairDetail/struct.go index 97a7d6d29..27f073121 100644 --- a/iSolarCloud/AppService/getDeviceRepairDetail/struct.go +++ b/iSolarCloud/AppService/getDeviceRepairDetail/struct.go @@ -5,9 +5,9 @@ package getDeviceRepairDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceTechBranchCount/data.go b/iSolarCloud/AppService/getDeviceTechBranchCount/data.go index 2f742f2bd..20ae012d9 100644 --- a/iSolarCloud/AppService/getDeviceTechBranchCount/data.go +++ b/iSolarCloud/AppService/getDeviceTechBranchCount/data.go @@ -1,11 +1,12 @@ package getDeviceTechBranchCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceTechBranchCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go b/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go index 862275e4f..0b793f198 100644 --- a/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go +++ b/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go @@ -5,9 +5,9 @@ package getDeviceTechBranchCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go index bfee9d837..04b18a999 100644 --- a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go +++ b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go @@ -1,11 +1,12 @@ package getDeviceTypeInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceTypeInfoList" @@ -25,10 +26,10 @@ func (rd RequestData) Help() string { } type ResultData []struct { - DeviceType valueTypes.Integer `json:"device_type"` - IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` - TypeCode valueTypes.Integer `json:"type_code"` - TypeName valueTypes.String `json:"type_name"` + DeviceType valueTypes.Integer `json:"device_type"` + IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` + TypeCode valueTypes.Integer `json:"type_code"` + TypeName valueTypes.String `json:"type_name"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go b/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go index 4fd4d962a..b77e28b87 100644 --- a/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go +++ b/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go @@ -5,9 +5,9 @@ package getDeviceTypeInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDeviceTypeList/data.go b/iSolarCloud/AppService/getDeviceTypeList/data.go index 38f4a76fe..f2a3e961e 100644 --- a/iSolarCloud/AppService/getDeviceTypeList/data.go +++ b/iSolarCloud/AppService/getDeviceTypeList/data.go @@ -1,10 +1,11 @@ package getDeviceTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,9 +27,9 @@ func (rd RequestData) Help() string { type ResultData struct { DeviceTypeList []struct { - DeviceType valueTypes.Integer `json:"device_type"` - DevListOrderId valueTypes.Integer `json:"dev_list_order_id"` - TypeName valueTypes.String `json:"type_name"` + DeviceType valueTypes.Integer `json:"device_type"` + DevListOrderId valueTypes.Integer `json:"dev_list_order_id"` + TypeName valueTypes.String `json:"type_name"` } `json:"deviceTypeList" DataTable:"true" DataTableSortOn:"DeviceType"` } @@ -37,7 +38,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/getDeviceTypeList/struct.go b/iSolarCloud/AppService/getDeviceTypeList/struct.go index e1277c169..d82ce468b 100644 --- a/iSolarCloud/AppService/getDeviceTypeList/struct.go +++ b/iSolarCloud/AppService/getDeviceTypeList/struct.go @@ -5,9 +5,9 @@ package getDeviceTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -391,11 +385,12 @@ func (e EndPoint) ResultDataRef() ResultData { } // GetFilename - Get filename based file type. -// func (e EndPoint) GetFilename(Type string) string { -// return e.ApiSetFilenamePrefix(format, args...) -// } +// +// func (e EndPoint) GetFilename(Type string) string { +// return e.ApiSetFilenamePrefix(format, args...) +// } +// // IsDebug - Are we in debug mode? func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getDstInfo/data.go b/iSolarCloud/AppService/getDstInfo/data.go index f8fe1f80b..994bea753 100644 --- a/iSolarCloud/AppService/getDstInfo/data.go +++ b/iSolarCloud/AppService/getDstInfo/data.go @@ -1,11 +1,12 @@ package getDstInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getDstInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getDstInfo/struct.go b/iSolarCloud/AppService/getDstInfo/struct.go index 2125abf98..ccaebfd54 100644 --- a/iSolarCloud/AppService/getDstInfo/struct.go +++ b/iSolarCloud/AppService/getDstInfo/struct.go @@ -5,9 +5,9 @@ package getDstInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getElectricitySettlementData/data.go b/iSolarCloud/AppService/getElectricitySettlementData/data.go index 30e384531..5c5a084d0 100644 --- a/iSolarCloud/AppService/getElectricitySettlementData/data.go +++ b/iSolarCloud/AppService/getElectricitySettlementData/data.go @@ -1,11 +1,12 @@ package getElectricitySettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getElectricitySettlementData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getElectricitySettlementData/struct.go b/iSolarCloud/AppService/getElectricitySettlementData/struct.go index d0f47a6e7..c0cc92610 100644 --- a/iSolarCloud/AppService/getElectricitySettlementData/struct.go +++ b/iSolarCloud/AppService/getElectricitySettlementData/struct.go @@ -5,9 +5,9 @@ package getElectricitySettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go b/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go index 7a9edf0ee..fe8067d5e 100644 --- a/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go +++ b/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go @@ -1,11 +1,12 @@ package getElectricitySettlementDetailData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getElectricitySettlementDetailData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go b/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go index b3399b9ef..83c3c77ee 100644 --- a/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go +++ b/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go @@ -5,9 +5,9 @@ package getElectricitySettlementDetailData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getEncryptPublicKey/data.go b/iSolarCloud/AppService/getEncryptPublicKey/data.go index 362babd6c..3a45813ca 100644 --- a/iSolarCloud/AppService/getEncryptPublicKey/data.go +++ b/iSolarCloud/AppService/getEncryptPublicKey/data.go @@ -1,9 +1,10 @@ package getEncryptPublicKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,7 +24,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData string func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getEncryptPublicKey/struct.go b/iSolarCloud/AppService/getEncryptPublicKey/struct.go index 9cd43f3b1..eac02e5bc 100644 --- a/iSolarCloud/AppService/getEncryptPublicKey/struct.go +++ b/iSolarCloud/AppService/getEncryptPublicKey/struct.go @@ -5,9 +5,9 @@ package getEncryptPublicKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultCount/data.go b/iSolarCloud/AppService/getFaultCount/data.go index 5138a3898..73cac216c 100644 --- a/iSolarCloud/AppService/getFaultCount/data.go +++ b/iSolarCloud/AppService/getFaultCount/data.go @@ -1,11 +1,12 @@ package getFaultCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData valueTypes.Integer func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getFaultCount/struct.go b/iSolarCloud/AppService/getFaultCount/struct.go index 1ca6406d7..d56713733 100644 --- a/iSolarCloud/AppService/getFaultCount/struct.go +++ b/iSolarCloud/AppService/getFaultCount/struct.go @@ -5,9 +5,9 @@ package getFaultCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultDetail/data.go b/iSolarCloud/AppService/getFaultDetail/data.go index 70bb50e46..39d61f9ea 100644 --- a/iSolarCloud/AppService/getFaultDetail/data.go +++ b/iSolarCloud/AppService/getFaultDetail/data.go @@ -1,11 +1,12 @@ package getFaultDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFaultDetail/struct.go b/iSolarCloud/AppService/getFaultDetail/struct.go index 47355aff5..ddbfecf59 100644 --- a/iSolarCloud/AppService/getFaultDetail/struct.go +++ b/iSolarCloud/AppService/getFaultDetail/struct.go @@ -5,9 +5,9 @@ package getFaultDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go b/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go index 5d202cd7d..b36e5141d 100644 --- a/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go +++ b/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go @@ -1,11 +1,12 @@ package getFaultMsgByFaultCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go b/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go index 458ce91ad..f9c8087af 100644 --- a/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go +++ b/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go @@ -5,9 +5,9 @@ package getFaultMsgByFaultCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go index cfb19ac7f..6e66f47fc 100644 --- a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go +++ b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go @@ -1,11 +1,12 @@ package getFaultMsgListByPageWithYYYYMM import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultMsgListByPageWithYYYYMM" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go index a40a8e4a2..cbe0188dc 100644 --- a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go +++ b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go @@ -5,9 +5,9 @@ package getFaultMsgListByPageWithYYYYMM import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go index a66320c5a..dbc10396e 100644 --- a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go +++ b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go @@ -1,11 +1,12 @@ package getFaultMsgListWithYYYYMM import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultMsgListWithYYYYMM" @@ -24,18 +25,17 @@ func (rd RequestData) Help() string { return ret } - -type ResultData []struct { - CreateTime valueTypes.Integer `json:"create_time"` - FaultCode valueTypes.String `json:"fault_code"` - FaultLevel valueTypes.Integer `json:"fault_level"` - 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.PsId `json:"ps_id"` - PsKey valueTypes.PsKey `json:"ps_key"` - UUID valueTypes.Integer `json:"uuid"` +type ResultData []struct { + CreateTime valueTypes.Integer `json:"create_time"` + FaultCode valueTypes.String `json:"fault_code"` + FaultLevel valueTypes.Integer `json:"fault_level"` + 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.PsId `json:"ps_id"` + PsKey valueTypes.PsKey `json:"ps_key"` + UUID valueTypes.Integer `json:"uuid"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go index 431d63b9d..29aadcf97 100644 --- a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go +++ b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go @@ -5,9 +5,9 @@ package getFaultMsgListWithYYYYMM import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFaultPlanList/data.go b/iSolarCloud/AppService/getFaultPlanList/data.go index 7d9b9df4c..73f174043 100644 --- a/iSolarCloud/AppService/getFaultPlanList/data.go +++ b/iSolarCloud/AppService/getFaultPlanList/data.go @@ -1,11 +1,12 @@ package getFaultPlanList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultPlanList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFaultPlanList/struct.go b/iSolarCloud/AppService/getFaultPlanList/struct.go index 3a6139a52..9285a6997 100644 --- a/iSolarCloud/AppService/getFaultPlanList/struct.go +++ b/iSolarCloud/AppService/getFaultPlanList/struct.go @@ -5,9 +5,9 @@ package getFaultPlanList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFileOperationRecordOne/data.go b/iSolarCloud/AppService/getFileOperationRecordOne/data.go index 38304c69c..eaf44969b 100644 --- a/iSolarCloud/AppService/getFileOperationRecordOne/data.go +++ b/iSolarCloud/AppService/getFileOperationRecordOne/data.go @@ -1,11 +1,12 @@ package getFileOperationRecordOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getFileOperationRecordOne" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFileOperationRecordOne/struct.go b/iSolarCloud/AppService/getFileOperationRecordOne/struct.go index bfd365fd6..99346f6d4 100644 --- a/iSolarCloud/AppService/getFileOperationRecordOne/struct.go +++ b/iSolarCloud/AppService/getFileOperationRecordOne/struct.go @@ -5,9 +5,9 @@ package getFileOperationRecordOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go b/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go index b21a181af..a924fd858 100644 --- a/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go +++ b/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go @@ -1,11 +1,12 @@ package getFormulaFaultAnalyseList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getFormulaFaultAnalyseList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go b/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go index f26f1a058..4db951d54 100644 --- a/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go +++ b/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go @@ -5,9 +5,9 @@ package getFormulaFaultAnalyseList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getGroupStringCheckResult/data.go b/iSolarCloud/AppService/getGroupStringCheckResult/data.go index cbf454d9f..402abe664 100644 --- a/iSolarCloud/AppService/getGroupStringCheckResult/data.go +++ b/iSolarCloud/AppService/getGroupStringCheckResult/data.go @@ -1,11 +1,12 @@ package getGroupStringCheckResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getGroupStringCheckResult" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getGroupStringCheckResult/struct.go b/iSolarCloud/AppService/getGroupStringCheckResult/struct.go index 55bf2ad8d..023ddac08 100644 --- a/iSolarCloud/AppService/getGroupStringCheckResult/struct.go +++ b/iSolarCloud/AppService/getGroupStringCheckResult/struct.go @@ -5,9 +5,9 @@ package getGroupStringCheckResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getGroupStringCheckRule/data.go b/iSolarCloud/AppService/getGroupStringCheckRule/data.go index e20da6900..b236e9b30 100644 --- a/iSolarCloud/AppService/getGroupStringCheckRule/data.go +++ b/iSolarCloud/AppService/getGroupStringCheckRule/data.go @@ -1,11 +1,12 @@ package getGroupStringCheckRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getGroupStringCheckRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getGroupStringCheckRule/struct.go b/iSolarCloud/AppService/getGroupStringCheckRule/struct.go index dde4ebf33..423a34bc0 100644 --- a/iSolarCloud/AppService/getGroupStringCheckRule/struct.go +++ b/iSolarCloud/AppService/getGroupStringCheckRule/struct.go @@ -5,9 +5,9 @@ package getGroupStringCheckRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHisData/data.go b/iSolarCloud/AppService/getHisData/data.go index cda0037dd..544c051f4 100644 --- a/iSolarCloud/AppService/getHisData/data.go +++ b/iSolarCloud/AppService/getHisData/data.go @@ -1,11 +1,12 @@ package getHisData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getHisData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHisData/struct.go b/iSolarCloud/AppService/getHisData/struct.go index 3b6e68d91..794d219d2 100644 --- a/iSolarCloud/AppService/getHisData/struct.go +++ b/iSolarCloud/AppService/getHisData/struct.go @@ -5,9 +5,9 @@ package getHisData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHistoryInfo/data.go b/iSolarCloud/AppService/getHistoryInfo/data.go index 183edda46..73f2a7db4 100644 --- a/iSolarCloud/AppService/getHistoryInfo/data.go +++ b/iSolarCloud/AppService/getHistoryInfo/data.go @@ -1,9 +1,9 @@ package getHistoryInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "AppService.getHistoryInfo" type RequestData struct { - DateType valueTypes.String `json:"date_type" required:"true"` + DateType valueTypes.String `json:"date_type" required:"true"` DateId valueTypes.DateTime `json:"date_id" required:"true"` } @@ -27,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHistoryInfo/struct.go b/iSolarCloud/AppService/getHistoryInfo/struct.go index a7815f75b..7d94ecede 100644 --- a/iSolarCloud/AppService/getHistoryInfo/struct.go +++ b/iSolarCloud/AppService/getHistoryInfo/struct.go @@ -5,9 +5,9 @@ package getHistoryInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdEvaluation/data.go b/iSolarCloud/AppService/getHouseholdEvaluation/data.go index c21637f82..f5fc86e0c 100644 --- a/iSolarCloud/AppService/getHouseholdEvaluation/data.go +++ b/iSolarCloud/AppService/getHouseholdEvaluation/data.go @@ -1,11 +1,12 @@ package getHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHouseholdEvaluation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdEvaluation/struct.go b/iSolarCloud/AppService/getHouseholdEvaluation/struct.go index a38c45534..f487239ea 100644 --- a/iSolarCloud/AppService/getHouseholdEvaluation/struct.go +++ b/iSolarCloud/AppService/getHouseholdEvaluation/struct.go @@ -5,9 +5,9 @@ package getHouseholdEvaluation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go index 123bb12d6..f76ff215c 100644 --- a/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go +++ b/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go @@ -1,11 +1,12 @@ package getHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHouseholdLeaveMessage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go index dcd734ed8..b1e010347 100644 --- a/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go +++ b/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go @@ -5,9 +5,9 @@ package getHouseholdLeaveMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go b/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go index 392dfa78e..de27163de 100644 --- a/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go +++ b/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go @@ -1,11 +1,12 @@ package getHouseholdOpinionFeedback import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHouseholdOpinionFeedback" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go b/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go index 7a78428c9..a1d29b6eb 100644 --- a/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go +++ b/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go @@ -5,9 +5,9 @@ package getHouseholdOpinionFeedback import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go index 719cefb16..cf682d05e 100644 --- a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go +++ b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go @@ -1,11 +1,12 @@ package getHouseholdPsInstallerByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getHouseholdPsInstallerByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go index 83046bee8..8fe7943f9 100644 --- a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go +++ b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go @@ -5,9 +5,9 @@ package getHouseholdPsInstallerByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go index 4eec6812f..44e5f9f19 100644 --- a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go +++ b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go @@ -1,13 +1,14 @@ package getHouseholdStoragePsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" - "github.com/MickMake/GoUnify/Only" "strings" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getHouseholdStoragePsReport" @@ -16,8 +17,8 @@ const EndPointName = "AppService.getHouseholdStoragePsReport" type RequestData struct { DateId valueTypes.DateTime `json:"date_id" required:"true"` - DateType valueTypes.String `json:"date_type" required:"true"` - PsId valueTypes.PsId `json:"ps_id" required:"true"` + DateType valueTypes.String `json:"date_type" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -71,32 +72,32 @@ type DayData struct { P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointVirtual:"true" PointUpdateFreq:"UpdateFreqDay"` P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` - P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqDay"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqDay"` + P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqDay"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqDay"` PointData15List []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateTimeAltLayout" PointIdReplace:"true"` - - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeAltLayout"` - - Zfzy valueTypes.Float `json:"zfzy" PointName:"PV Power To Battery" PointUnitFrom:"ZfzyUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - ZfzyUnit valueTypes.String `json:"zfzy_unit" PointIgnore:"true"` - P83076 valueTypes.Float `json:"p83076" PointName:"PV Power" PointUnitFrom:"P83076Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83076Unit valueTypes.String `json:"p83076_unit" PointIgnore:"true"` - P83080 valueTypes.Float `json:"p83080" PointName:"PV Power To Grid" PointUnitFrom:"P83080Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83080Unit valueTypes.String `json:"p83080_unit" PointIgnore:"true"` - P83086 valueTypes.Float `json:"p83086" PointUnitFrom:"P83086Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83086Unit valueTypes.String `json:"p83086_unit" PointIgnore:"true"` - P83087 valueTypes.Float `json:"p83087" PointName:"PV Power To Battery" PointUnitFrom:"P83087Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83087Unit valueTypes.String `json:"p83087_unit" PointIgnore:"true"` - P83096 valueTypes.Float `json:"p83096" PointUnitFrom:"P83096Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83096Unit valueTypes.String `json:"p83096_unit" PointIgnore:"true"` - P83101 valueTypes.Float `json:"p83101" PointUnitFrom:"P83101Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83101Unit valueTypes.String `json:"p83101_unit" PointIgnore:"true"` - P83106 valueTypes.Float `json:"p83106" PointName:"PV Power To Load" PointUnitFrom:"P83106Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83106Unit valueTypes.String `json:"p83106_unit" PointIgnore:"true"` - P83128 valueTypes.Float `json:"p83128" PointName:"Grid Power" PointUnitFrom:"P83128Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` - P83128Unit valueTypes.String `json:"p83128_unit" PointIgnore:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateTimeAltLayout" PointIdReplace:"true"` + + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeAltLayout"` + + Zfzy valueTypes.Float `json:"zfzy" PointName:"PV Power To Battery" PointUnitFrom:"ZfzyUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + ZfzyUnit valueTypes.String `json:"zfzy_unit" PointIgnore:"true"` + P83076 valueTypes.Float `json:"p83076" PointName:"PV Power" PointUnitFrom:"P83076Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83076Unit valueTypes.String `json:"p83076_unit" PointIgnore:"true"` + P83080 valueTypes.Float `json:"p83080" PointName:"PV Power To Grid" PointUnitFrom:"P83080Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83080Unit valueTypes.String `json:"p83080_unit" PointIgnore:"true"` + P83086 valueTypes.Float `json:"p83086" PointUnitFrom:"P83086Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83086Unit valueTypes.String `json:"p83086_unit" PointIgnore:"true"` + P83087 valueTypes.Float `json:"p83087" PointName:"PV Power To Battery" PointUnitFrom:"P83087Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83087Unit valueTypes.String `json:"p83087_unit" PointIgnore:"true"` + P83096 valueTypes.Float `json:"p83096" PointUnitFrom:"P83096Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83096Unit valueTypes.String `json:"p83096_unit" PointIgnore:"true"` + P83101 valueTypes.Float `json:"p83101" PointUnitFrom:"P83101Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83101Unit valueTypes.String `json:"p83101_unit" PointIgnore:"true"` + P83106 valueTypes.Float `json:"p83106" PointName:"PV Power To Load" PointUnitFrom:"P83106Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83106Unit valueTypes.String `json:"p83106_unit" PointIgnore:"true"` + P83128 valueTypes.Float `json:"p83128" PointName:"Grid Power" PointUnitFrom:"P83128Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqDay"` + P83128Unit valueTypes.String `json:"p83128_unit" PointIgnore:"true"` } `json:"point_data_15_list" PointId:"data" PointIdReplace:"true" DataTable:"true"` } @@ -128,177 +129,176 @@ type MonthData struct { P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth"` P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` - P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth"` + P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth"` MonthDataDayList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutDay" PointIdReplace:"true"` - - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutDay"` - DateId valueTypes.Integer `json:"date_id"` - PsId valueTypes.PsId `json:"ps_id"` - - SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` - SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` - Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` - Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` - P83072 valueTypes.Float `json:"p83072" PointUnitFrom:"P83072Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83072Unit valueTypes.String `json:"p83072_unit" PointIgnore:"true"` - P83077 valueTypes.Float `json:"p83077" PointUnitFrom:"P83077Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83077Unit valueTypes.String `json:"p83077_unit" PointIgnore:"true"` - P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` - P83089 valueTypes.Float `json:"p83089" PointUnitFrom:"P83089Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83089Unit valueTypes.String `json:"p83089_unit" PointIgnore:"true"` - P83097 valueTypes.Float `json:"p83097" PointUnitFrom:"P83097Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83097Unit valueTypes.String `json:"p83097_unit" PointIgnore:"true"` - P83102 valueTypes.Float `json:"p83102" PointUnitFrom:"P83102Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83102Unit valueTypes.String `json:"p83102_unit" PointIgnore:"true"` - P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` - P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` - - P83022 valueTypes.Float `json:"p83022" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth" PointTimestampFrom:"TimeStamp"` - + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutDay" PointIdReplace:"true"` + + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutDay"` + DateId valueTypes.Integer `json:"date_id"` + PsId valueTypes.PsId `json:"ps_id"` + + SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` + SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` + Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` + Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` + P83072 valueTypes.Float `json:"p83072" PointUnitFrom:"P83072Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83072Unit valueTypes.String `json:"p83072_unit" PointIgnore:"true"` + P83077 valueTypes.Float `json:"p83077" PointUnitFrom:"P83077Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83077Unit valueTypes.String `json:"p83077_unit" PointIgnore:"true"` + P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` + P83089 valueTypes.Float `json:"p83089" PointUnitFrom:"P83089Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83089Unit valueTypes.String `json:"p83089_unit" PointIgnore:"true"` + P83097 valueTypes.Float `json:"p83097" PointUnitFrom:"P83097Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83097Unit valueTypes.String `json:"p83097_unit" PointIgnore:"true"` + P83102 valueTypes.Float `json:"p83102" PointUnitFrom:"P83102Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83102Unit valueTypes.String `json:"p83102_unit" PointIgnore:"true"` + P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` + P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` + + P83022 valueTypes.Float `json:"p83022" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqMonth"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqMonth" PointTimestampFrom:"TimeStamp"` } `json:"month_data_day_list" PointId:"data" PointIdReplace:"true" DataTable:"true"` } type YearData struct { - JthdMap valueTypes.UnitValue `json:"jthd_map" PointVirtual:"true"` - JthdMapVirgin valueTypes.UnitValue `json:"jthd_map_virgin" PointIgnore:"true"` - JtydMap valueTypes.UnitValue `json:"jtyd_map" PointVirtual:"true"` - JtydMapVirgin valueTypes.UnitValue `json:"jtyd_map_virgin" PointIgnore:"true"` - ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointVirtual:"true"` - ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` - ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointVirtual:"true"` - ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` - P83074 valueTypes.UnitValue `json:"p83074_map" PointId:"p83074" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83074MapVirgin valueTypes.UnitValue `json:"p83074_map_virgin" PointIgnore:"true"` - P83079 valueTypes.UnitValue `json:"p83079_map" PointId:"p83079" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83079MapVirgin valueTypes.UnitValue `json:"p83079_map_virgin" PointIgnore:"true"` - P83088 valueTypes.UnitValue `json:"p83088_map" PointId:"p83088" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83088MapVirgin valueTypes.UnitValue `json:"p83088_map_virgin" PointIgnore:"true"` - P83093 valueTypes.UnitValue `json:"p83093_map" PointId:"p83093" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83093MapVirgin valueTypes.UnitValue `json:"p83093_map_virgin" PointIgnore:"true"` - P83097 valueTypes.UnitValue `json:"p83097_map" PointId:"p83097" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83097MapVirgin valueTypes.UnitValue `json:"p83097_map_virgin" PointIgnore:"true"` - P83104 valueTypes.UnitValue `json:"p83104_map" PointId:"p83104" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83104MapVirgin valueTypes.UnitValue `json:"p83104_map_virgin" PointIgnore:"true"` - P83118 valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` - P83119 valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` - P83120 valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` - - P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + JthdMap valueTypes.UnitValue `json:"jthd_map" PointVirtual:"true"` + JthdMapVirgin valueTypes.UnitValue `json:"jthd_map_virgin" PointIgnore:"true"` + JtydMap valueTypes.UnitValue `json:"jtyd_map" PointVirtual:"true"` + JtydMapVirgin valueTypes.UnitValue `json:"jtyd_map_virgin" PointIgnore:"true"` + ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointVirtual:"true"` + ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` + ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointVirtual:"true"` + ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` + P83074 valueTypes.UnitValue `json:"p83074_map" PointId:"p83074" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83074MapVirgin valueTypes.UnitValue `json:"p83074_map_virgin" PointIgnore:"true"` + P83079 valueTypes.UnitValue `json:"p83079_map" PointId:"p83079" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83079MapVirgin valueTypes.UnitValue `json:"p83079_map_virgin" PointIgnore:"true"` + P83088 valueTypes.UnitValue `json:"p83088_map" PointId:"p83088" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83088MapVirgin valueTypes.UnitValue `json:"p83088_map_virgin" PointIgnore:"true"` + P83093 valueTypes.UnitValue `json:"p83093_map" PointId:"p83093" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83093MapVirgin valueTypes.UnitValue `json:"p83093_map_virgin" PointIgnore:"true"` + P83097 valueTypes.UnitValue `json:"p83097_map" PointId:"p83097" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83097MapVirgin valueTypes.UnitValue `json:"p83097_map_virgin" PointIgnore:"true"` + P83104 valueTypes.UnitValue `json:"p83104_map" PointId:"p83104" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83104MapVirgin valueTypes.UnitValue `json:"p83104_map_virgin" PointIgnore:"true"` + P83118 valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` + P83119 valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` + P83120 valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` + + P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear"` YearDataMonthList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutMonth" PointIdReplace:"true"` - - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutMonth"` - DateId valueTypes.Integer `json:"date_id"` - PsId valueTypes.PsId `json:"ps_id"` - - SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` - SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` - Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` - Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` - P83073 valueTypes.Float `json:"p83073" PointUnitFrom:"P83073Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83073Unit valueTypes.String `json:"p83073_unit" PointIgnore:"true"` - P83078 valueTypes.Float `json:"p83078" PointUnitFrom:"P83078Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83078Unit valueTypes.String `json:"p83078_unit" PointIgnore:"true"` - P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` - P83091 valueTypes.Float `json:"p83091" PointUnitFrom:"P83091Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83091Unit valueTypes.String `json:"p83091_unit" PointIgnore:"true"` - P83098 valueTypes.Float `json:"p83098" PointUnitFrom:"P83098Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83098Unit valueTypes.String `json:"p83098_unit" PointIgnore:"true"` - P83103 valueTypes.Float `json:"p83103" PointUnitFrom:"P83103Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83103Unit valueTypes.String `json:"p83103_unit" PointIgnore:"true"` - P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` - P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` - - P83037 valueTypes.Float `json:"p83037" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear" PointTimestampFrom:"TimeStamp"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutMonth" PointIdReplace:"true"` + + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutMonth"` + DateId valueTypes.Integer `json:"date_id"` + PsId valueTypes.PsId `json:"ps_id"` + + SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` + SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` + Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` + Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` + P83073 valueTypes.Float `json:"p83073" PointUnitFrom:"P83073Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83073Unit valueTypes.String `json:"p83073_unit" PointIgnore:"true"` + P83078 valueTypes.Float `json:"p83078" PointUnitFrom:"P83078Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83078Unit valueTypes.String `json:"p83078_unit" PointIgnore:"true"` + P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` + P83091 valueTypes.Float `json:"p83091" PointUnitFrom:"P83091Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83091Unit valueTypes.String `json:"p83091_unit" PointIgnore:"true"` + P83098 valueTypes.Float `json:"p83098" PointUnitFrom:"P83098Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83098Unit valueTypes.String `json:"p83098_unit" PointIgnore:"true"` + P83103 valueTypes.Float `json:"p83103" PointUnitFrom:"P83103Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83103Unit valueTypes.String `json:"p83103_unit" PointIgnore:"true"` + P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` + P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` + + P83037 valueTypes.Float `json:"p83037" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83121 valueTypes.Float `json:"p83121" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqYear"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqYear" PointTimestampFrom:"TimeStamp"` } `json:"year_data_month_list" PointId:"data" PointIdReplace:"true" DataTable:"true"` } type TotalData struct { - JthdMap valueTypes.UnitValue `json:"jthd_map" PointVirtual:"true"` - JthdMapVirgin valueTypes.UnitValue `json:"jthd_map_virgin" PointIgnore:"true"` - JtydMap valueTypes.UnitValue `json:"jtyd_map" PointVirtual:"true"` - JtydMapVirgin valueTypes.UnitValue `json:"jtyd_map_virgin" PointIgnore:"true"` - ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointVirtual:"true"` - ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` - ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointVirtual:"true"` - ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` - P83075 valueTypes.UnitValue `json:"p83075_map" PointId:"p83075" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83075MapVirgin valueTypes.UnitValue `json:"p83075_map_virgin" PointIgnore:"true"` - P83094 valueTypes.UnitValue `json:"p83094_map" PointId:"p83094" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83094MapVirgin valueTypes.UnitValue `json:"p83094_map_virgin" PointIgnore:"true"` - P83095 valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83095MapVirgin valueTypes.UnitValue `json:"p83095_map_virgin" PointIgnore:"true"` - P83105 valueTypes.UnitValue `json:"p83105_map" PointId:"p83105" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83105MapVirgin valueTypes.UnitValue `json:"p83105_map_virgin" PointIgnore:"true"` - P83107 valueTypes.UnitValue `json:"p83107_map" PointId:"p83107" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83107MapVirgin valueTypes.UnitValue `json:"p83107_map_virgin" PointIgnore:"true"` - P83123 valueTypes.UnitValue `json:"p83123_map" PointId:"p83123" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83123MapVirgin valueTypes.UnitValue `json:"p83123_map_virgin" PointIgnore:"true"` - P83124 valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` - P83127 valueTypes.UnitValue `json:"p83127_map" PointId:"p83127" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83127MapVirgin valueTypes.UnitValue `json:"p83127_map_virgin" PointIgnore:"true"` - - P83125 valueTypes.Float `json:"p83125" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` - P83126 valueTypes.Float `json:"p83126" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + JthdMap valueTypes.UnitValue `json:"jthd_map" PointVirtual:"true"` + JthdMapVirgin valueTypes.UnitValue `json:"jthd_map_virgin" PointIgnore:"true"` + JtydMap valueTypes.UnitValue `json:"jtyd_map" PointVirtual:"true"` + JtydMapVirgin valueTypes.UnitValue `json:"jtyd_map_virgin" PointIgnore:"true"` + ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointVirtual:"true"` + ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` + ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointVirtual:"true"` + ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` + P83075 valueTypes.UnitValue `json:"p83075_map" PointId:"p83075" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83075MapVirgin valueTypes.UnitValue `json:"p83075_map_virgin" PointIgnore:"true"` + P83094 valueTypes.UnitValue `json:"p83094_map" PointId:"p83094" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83094MapVirgin valueTypes.UnitValue `json:"p83094_map_virgin" PointIgnore:"true"` + P83095 valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83095MapVirgin valueTypes.UnitValue `json:"p83095_map_virgin" PointIgnore:"true"` + P83105 valueTypes.UnitValue `json:"p83105_map" PointId:"p83105" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83105MapVirgin valueTypes.UnitValue `json:"p83105_map_virgin" PointIgnore:"true"` + P83107 valueTypes.UnitValue `json:"p83107_map" PointId:"p83107" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83107MapVirgin valueTypes.UnitValue `json:"p83107_map_virgin" PointIgnore:"true"` + P83123 valueTypes.UnitValue `json:"p83123_map" PointId:"p83123" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83123MapVirgin valueTypes.UnitValue `json:"p83123_map_virgin" PointIgnore:"true"` + P83124 valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` + P83127 valueTypes.UnitValue `json:"p83127_map" PointId:"p83127" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83127MapVirgin valueTypes.UnitValue `json:"p83127_map_virgin" PointIgnore:"true"` + + P83125 valueTypes.Float `json:"p83125" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` + P83126 valueTypes.Float `json:"p83126" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal"` TotalDataYearList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutYear" PointIdReplace:"true"` - - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutYear"` - DateId valueTypes.Integer `json:"date_id"` - PsId valueTypes.PsId `json:"ps_id"` - - SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` - SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` - Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` - Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` - JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` - P83074 valueTypes.Float `json:"p83074" PointUnitFrom:"P83074Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83074Unit valueTypes.String `json:"p83074_unit" PointIgnore:"true"` - P83079 valueTypes.Float `json:"p83079" PointUnitFrom:"P83079Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83079Unit valueTypes.String `json:"p83079_unit" PointIgnore:"true"` - P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` - P83093 valueTypes.Float `json:"p83093" PointUnitFrom:"P83093Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83093Unit valueTypes.String `json:"p83093_unit" PointIgnore:"true"` - P83099 valueTypes.Float `json:"p83099" PointUnitFrom:"P83099Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83099Unit valueTypes.String `json:"p83099_unit" PointIgnore:"true"` - P83104 valueTypes.Float `json:"p83104" PointUnitFrom:"P83104Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83104Unit valueTypes.String `json:"p83104_unit" PointIgnore:"true"` - P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` - P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` - - P83038 valueTypes.Float `json:"p83038" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal" PointTimestampFrom:"TimeStamp"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateLayoutYear" PointIdReplace:"true"` + + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateLayoutYear"` + DateId valueTypes.Integer `json:"date_id"` + PsId valueTypes.PsId `json:"ps_id"` + + SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"` + SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"` + Jthd valueTypes.Float `json:"jthd" PointUnitFrom:"JthdUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JthdUnit valueTypes.String `json:"jthd_unit" PointIgnore:"true"` + Jtyd valueTypes.Float `json:"jtyd" PointUnitFrom:"JtydUnit" PointVirtual:"true" PointTimestampFrom:"TimeStamp"` + JtydUnit valueTypes.String `json:"jtyd_unit" PointIgnore:"true"` + P83074 valueTypes.Float `json:"p83074" PointUnitFrom:"P83074Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83074Unit valueTypes.String `json:"p83074_unit" PointIgnore:"true"` + P83079 valueTypes.Float `json:"p83079" PointUnitFrom:"P83079Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83079Unit valueTypes.String `json:"p83079_unit" PointIgnore:"true"` + P83088 valueTypes.Float `json:"p83088" PointUnitFrom:"P83088Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83088Unit valueTypes.String `json:"p83088_unit" PointIgnore:"true"` + P83093 valueTypes.Float `json:"p83093" PointUnitFrom:"P83093Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83093Unit valueTypes.String `json:"p83093_unit" PointIgnore:"true"` + P83099 valueTypes.Float `json:"p83099" PointUnitFrom:"P83099Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83099Unit valueTypes.String `json:"p83099_unit" PointIgnore:"true"` + P83104 valueTypes.Float `json:"p83104" PointUnitFrom:"P83104Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83104Unit valueTypes.String `json:"p83104_unit" PointIgnore:"true"` + P83118 valueTypes.Float `json:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` + P83119 valueTypes.Float `json:"p83119" PointUnitFrom:"P83119Unit" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83119Unit valueTypes.String `json:"p83119_unit" PointIgnore:"true"` + + P83038 valueTypes.Float `json:"p83038" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83120 valueTypes.Float `json:"p83120" PointUnit:"Wh" PointVirtual:"true" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqTotal"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreqTotal" PointTimestampFrom:"TimeStamp"` } `json:"total_data_year_list" PointId:"data" PointIdReplace:"true" DataTable:"true"` } @@ -357,7 +357,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String())) diff --git a/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go b/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go index d36390997..f98ea3e5a 100644 --- a/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go +++ b/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go @@ -5,9 +5,9 @@ package getHouseholdStoragePsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -395,4 +389,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdUserInfo/data.go b/iSolarCloud/AppService/getHouseholdUserInfo/data.go index 11338caad..f90552f98 100644 --- a/iSolarCloud/AppService/getHouseholdUserInfo/data.go +++ b/iSolarCloud/AppService/getHouseholdUserInfo/data.go @@ -1,11 +1,12 @@ package getHouseholdUserInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getHouseholdUserInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdUserInfo/struct.go b/iSolarCloud/AppService/getHouseholdUserInfo/struct.go index 3eea3953b..4ff198477 100644 --- a/iSolarCloud/AppService/getHouseholdUserInfo/struct.go +++ b/iSolarCloud/AppService/getHouseholdUserInfo/struct.go @@ -5,9 +5,9 @@ package getHouseholdUserInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go index 3357e7213..3ffa60a8c 100644 --- a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go +++ b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go @@ -1,11 +1,12 @@ package getHouseholdWorkOrderInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHouseholdWorkOrderInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go index cc4faf24c..528cba6a0 100644 --- a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go +++ b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go @@ -5,9 +5,9 @@ package getHouseholdWorkOrderInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go b/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go index e5d2033f3..b832aab63 100644 --- a/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go +++ b/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go @@ -1,11 +1,12 @@ package getHouseholdWorkOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHouseholdWorkOrderList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go b/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go index 9490c7566..54472fc22 100644 --- a/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go +++ b/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go @@ -5,9 +5,9 @@ package getHouseholdWorkOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getI18nConfigByType/data.go b/iSolarCloud/AppService/getI18nConfigByType/data.go index 82fdfa1a0..2d4d69c73 100644 --- a/iSolarCloud/AppService/getI18nConfigByType/data.go +++ b/iSolarCloud/AppService/getI18nConfigByType/data.go @@ -1,11 +1,12 @@ package getI18nConfigByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/i18nfile/getI18nConfigByType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getI18nConfigByType/struct.go b/iSolarCloud/AppService/getI18nConfigByType/struct.go index c024fa357..9effe972c 100644 --- a/iSolarCloud/AppService/getI18nConfigByType/struct.go +++ b/iSolarCloud/AppService/getI18nConfigByType/struct.go @@ -5,9 +5,9 @@ package getI18nConfigByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getI18nFileInfo/data.go b/iSolarCloud/AppService/getI18nFileInfo/data.go index 14ca378e3..8542b5967 100644 --- a/iSolarCloud/AppService/getI18nFileInfo/data.go +++ b/iSolarCloud/AppService/getI18nFileInfo/data.go @@ -1,11 +1,12 @@ package getI18nFileInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/i18nfile/getI18nFileInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getI18nFileInfo/struct.go b/iSolarCloud/AppService/getI18nFileInfo/struct.go index b6da6fc71..6972eef19 100644 --- a/iSolarCloud/AppService/getI18nFileInfo/struct.go +++ b/iSolarCloud/AppService/getI18nFileInfo/struct.go @@ -5,9 +5,9 @@ package getI18nFileInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getI18nInfoByKey/data.go b/iSolarCloud/AppService/getI18nInfoByKey/data.go index 6f9da98d3..93c2d848b 100644 --- a/iSolarCloud/AppService/getI18nInfoByKey/data.go +++ b/iSolarCloud/AppService/getI18nInfoByKey/data.go @@ -1,11 +1,12 @@ package getI18nInfoByKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/i18nfile/getI18nInfoByKey" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getI18nInfoByKey/struct.go b/iSolarCloud/AppService/getI18nInfoByKey/struct.go index e6307529c..9c255a7df 100644 --- a/iSolarCloud/AppService/getI18nInfoByKey/struct.go +++ b/iSolarCloud/AppService/getI18nInfoByKey/struct.go @@ -5,9 +5,9 @@ package getI18nInfoByKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getI18nVersion/data.go b/iSolarCloud/AppService/getI18nVersion/data.go index fa76b5609..6d4473d45 100644 --- a/iSolarCloud/AppService/getI18nVersion/data.go +++ b/iSolarCloud/AppService/getI18nVersion/data.go @@ -1,11 +1,12 @@ package getI18nVersion import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/international/getI18nVersion" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getI18nVersion/struct.go b/iSolarCloud/AppService/getI18nVersion/struct.go index c88cdc0a6..7110d7662 100644 --- a/iSolarCloud/AppService/getI18nVersion/struct.go +++ b/iSolarCloud/AppService/getI18nVersion/struct.go @@ -5,9 +5,9 @@ package getI18nVersion import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getIncomeSettingInfos/data.go b/iSolarCloud/AppService/getIncomeSettingInfos/data.go index 292da07ef..97cd560b5 100644 --- a/iSolarCloud/AppService/getIncomeSettingInfos/data.go +++ b/iSolarCloud/AppService/getIncomeSettingInfos/data.go @@ -1,10 +1,11 @@ package getIncomeSettingInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -41,7 +42,7 @@ type ResultData struct { NationAllowanceMoney interface{} `json:"nation_allowance_money"` ParamIncomeUnit valueTypes.Integer `json:"param_income_unit"` ProvinceAllowanceMoney interface{} `json:"province_allowance_money"` - PsId valueTypes.PsId `json:"ps_id"` + PsId valueTypes.PsId `json:"ps_id"` StartTime valueTypes.DateTime `json:"start_time" PointNameDateFormat:"DateTimeLayout"` UseSharpPeekValleyFlat interface{} `json:"use_sharp_peek_valley_flat"` ValidFlag valueTypes.Bool `json:"valid_flag"` @@ -52,7 +53,7 @@ type ResultData struct { EndTime valueTypes.DateTime `json:"end_time" PointNameDateFormat:"DateTimeLayout"` IntervalTimeCharge valueTypes.String `json:"interval_time_charge"` OnlineElectricityPercent valueTypes.Float `json:"online_electricity_percent" PointUnit:"%"` - PsId valueTypes.PsId `json:"ps_id"` + PsId valueTypes.PsId `json:"ps_id"` StartTime valueTypes.DateTime `json:"start_time" PointNameDateFormat:"DateTimeLayout"` UseElectricityDiscount valueTypes.Float `json:"use_electricity_discount" PointUnit:"%"` } `json:"powerSelfUseTimesChargeMap" PointId:"power_selfuse_times_charge_map"` diff --git a/iSolarCloud/AppService/getIncomeSettingInfos/struct.go b/iSolarCloud/AppService/getIncomeSettingInfos/struct.go index 549079f4f..7426fcbb4 100644 --- a/iSolarCloud/AppService/getIncomeSettingInfos/struct.go +++ b/iSolarCloud/AppService/getIncomeSettingInfos/struct.go @@ -5,9 +5,9 @@ package getIncomeSettingInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInfoFromAMap/data.go b/iSolarCloud/AppService/getInfoFromAMap/data.go index f7e84117a..500c5d364 100644 --- a/iSolarCloud/AppService/getInfoFromAMap/data.go +++ b/iSolarCloud/AppService/getInfoFromAMap/data.go @@ -1,11 +1,12 @@ package getInfoFromAMap import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getInfoFromAMap" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getInfoFromAMap/struct.go b/iSolarCloud/AppService/getInfoFromAMap/struct.go index 9d2bf4ba5..172bf27f5 100644 --- a/iSolarCloud/AppService/getInfoFromAMap/struct.go +++ b/iSolarCloud/AppService/getInfoFromAMap/struct.go @@ -5,9 +5,9 @@ package getInfoFromAMap import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInfomationFromRedis/data.go b/iSolarCloud/AppService/getInfomationFromRedis/data.go index e8b15a48b..283fe8ae6 100644 --- a/iSolarCloud/AppService/getInfomationFromRedis/data.go +++ b/iSolarCloud/AppService/getInfomationFromRedis/data.go @@ -1,11 +1,12 @@ package getInfomationFromRedis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInfomationFromRedis" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getInfomationFromRedis/struct.go b/iSolarCloud/AppService/getInfomationFromRedis/struct.go index 0d769e6bb..61c3fdef1 100644 --- a/iSolarCloud/AppService/getInfomationFromRedis/struct.go +++ b/iSolarCloud/AppService/getInfomationFromRedis/struct.go @@ -5,9 +5,9 @@ package getInfomationFromRedis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInstallInfoList/data.go b/iSolarCloud/AppService/getInstallInfoList/data.go index 3aff8afa1..9c6f20afa 100644 --- a/iSolarCloud/AppService/getInstallInfoList/data.go +++ b/iSolarCloud/AppService/getInstallInfoList/data.go @@ -1,11 +1,12 @@ package getInstallInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getInstallInfoList" @@ -24,12 +25,11 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - Installer string `json:"installer"` - InstallerEmail string `json:"installer_email"` - InstallerPhone string `json:"installer_phone"` - OrgId string `json:"org_id"` + Installer string `json:"installer"` + InstallerEmail string `json:"installer_email"` + InstallerPhone string `json:"installer_phone"` + OrgId string `json:"org_id"` PsNames []valueTypes.String `json:"ps_names" DataTable:"true"` } diff --git a/iSolarCloud/AppService/getInstallInfoList/struct.go b/iSolarCloud/AppService/getInstallInfoList/struct.go index 9d2e7b1c5..44c186d9e 100644 --- a/iSolarCloud/AppService/getInstallInfoList/struct.go +++ b/iSolarCloud/AppService/getInstallInfoList/struct.go @@ -5,9 +5,9 @@ package getInstallInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go index bdc8188fd..18e91f397 100644 --- a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go +++ b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go @@ -1,10 +1,11 @@ package getInstallerInfoByDealerOrgCodeOrId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go index b3c16461d..d216ec073 100644 --- a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go +++ b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go @@ -5,9 +5,9 @@ package getInstallerInfoByDealerOrgCodeOrId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInvertDataList/data.go b/iSolarCloud/AppService/getInvertDataList/data.go index 0303941f4..f9b7523d7 100644 --- a/iSolarCloud/AppService/getInvertDataList/data.go +++ b/iSolarCloud/AppService/getInvertDataList/data.go @@ -1,9 +1,10 @@ package getInvertDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getInvertDataList/struct.go b/iSolarCloud/AppService/getInvertDataList/struct.go index 2b8ee544e..babd0d340 100644 --- a/iSolarCloud/AppService/getInvertDataList/struct.go +++ b/iSolarCloud/AppService/getInvertDataList/struct.go @@ -5,9 +5,9 @@ package getInvertDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInverterDataCount/data.go b/iSolarCloud/AppService/getInverterDataCount/data.go index 0cede964b..6bb655d3e 100644 --- a/iSolarCloud/AppService/getInverterDataCount/data.go +++ b/iSolarCloud/AppService/getInverterDataCount/data.go @@ -1,11 +1,12 @@ package getInverterDataCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInverterDataCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getInverterDataCount/struct.go b/iSolarCloud/AppService/getInverterDataCount/struct.go index ed3de3c1a..ed59e2aff 100644 --- a/iSolarCloud/AppService/getInverterDataCount/struct.go +++ b/iSolarCloud/AppService/getInverterDataCount/struct.go @@ -5,9 +5,9 @@ package getInverterDataCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInverterProcess/data.go b/iSolarCloud/AppService/getInverterProcess/data.go index 2912f36e8..5a1d49f03 100644 --- a/iSolarCloud/AppService/getInverterProcess/data.go +++ b/iSolarCloud/AppService/getInverterProcess/data.go @@ -1,11 +1,12 @@ package getInverterProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInverterProcess" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getInverterProcess/struct.go b/iSolarCloud/AppService/getInverterProcess/struct.go index dbd884ad3..b80aac682 100644 --- a/iSolarCloud/AppService/getInverterProcess/struct.go +++ b/iSolarCloud/AppService/getInverterProcess/struct.go @@ -5,9 +5,9 @@ package getInverterProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getInverterUuidBytotalId/data.go b/iSolarCloud/AppService/getInverterUuidBytotalId/data.go index a50555dc6..c3f88158b 100644 --- a/iSolarCloud/AppService/getInverterUuidBytotalId/data.go +++ b/iSolarCloud/AppService/getInverterUuidBytotalId/data.go @@ -1,11 +1,12 @@ package getInverterUuidBytotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInverterUuidBytotalId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go b/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go index 52e1544f7..c0dee3822 100644 --- a/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go +++ b/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go @@ -5,9 +5,9 @@ package getInverterUuidBytotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getIvEchartsData/data.go b/iSolarCloud/AppService/getIvEchartsData/data.go index 976219b02..887cd4a60 100644 --- a/iSolarCloud/AppService/getIvEchartsData/data.go +++ b/iSolarCloud/AppService/getIvEchartsData/data.go @@ -1,11 +1,12 @@ package getIvEchartsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getIvEchartsData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getIvEchartsData/struct.go b/iSolarCloud/AppService/getIvEchartsData/struct.go index a10534f92..d91064b02 100644 --- a/iSolarCloud/AppService/getIvEchartsData/struct.go +++ b/iSolarCloud/AppService/getIvEchartsData/struct.go @@ -5,9 +5,9 @@ package getIvEchartsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getIvEchartsDataById/data.go b/iSolarCloud/AppService/getIvEchartsDataById/data.go index de2f02f34..dd2acfa9d 100644 --- a/iSolarCloud/AppService/getIvEchartsDataById/data.go +++ b/iSolarCloud/AppService/getIvEchartsDataById/data.go @@ -1,11 +1,12 @@ package getIvEchartsDataById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getIvEchartsDataById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getIvEchartsDataById/struct.go b/iSolarCloud/AppService/getIvEchartsDataById/struct.go index 1ccacb30a..432aeb28a 100644 --- a/iSolarCloud/AppService/getIvEchartsDataById/struct.go +++ b/iSolarCloud/AppService/getIvEchartsDataById/struct.go @@ -5,9 +5,9 @@ package getIvEchartsDataById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getKpiInfo/data.go b/iSolarCloud/AppService/getKpiInfo/data.go index b314404c9..4fa4f8e9e 100644 --- a/iSolarCloud/AppService/getKpiInfo/data.go +++ b/iSolarCloud/AppService/getKpiInfo/data.go @@ -1,10 +1,11 @@ package getKpiInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getKpiInfo" @@ -24,28 +25,28 @@ func (rd RequestData) Help() string { } type ResultData struct { - ActualEnergy []valueTypes.Float `json:"actual_energy" PointUnitFrom:"ActualEnergyUnit" DataTable:"true" DataTableMerge:"true" DataTableIndex:"true"` - ActualEnergyUnit valueTypes.String `json:"actual_energy_unit" PointIgnore:"true"` - PlanEnergy []valueTypes.Float `json:"plan_energy" PointUnitFrom:"PlanEnergyUnit" DataTable:"true" DataTableMerge:"true" DataTableIndex:"true"` - PlanEnergyUnit valueTypes.String `json:"plan_energy_unit" PointIgnore:"true"` - - OrgName valueTypes.String `json:"org_name"` - PsCount valueTypes.Integer `json:"ps_count"` - TotalCapacity valueTypes.UnitValue `json:"total_capcity" PointId:"total_capacity" PointUpdateFreq:"UpdateFreqTotal"` - TotalDesignCapacity valueTypes.UnitValue `json:"total_design_capacity" PointUpdateFreq:"UpdateFreqTotal"` - - P83024 valueTypes.Float `json:"p83024" PointUnit:"Wh" PointVirtual:"true"` - TodayEnergy valueTypes.UnitValue `json:"today_energy" PointUpdateFreq:"UpdateFreqTotal"` - MonthEnergy valueTypes.UnitValue `json:"month_energy" PointUpdateFreq:"UpdateFreqMonth"` - YearEnergy valueTypes.UnitValue `json:"year_energy" PointUpdateFreq:"UpdateFreqYear"` - TotalEnergy valueTypes.UnitValue `json:"total_energy" PointUpdateFreq:"UpdateFreqTotal"` - - ChargeTotalEnergy valueTypes.Float `json:"charge_total_energy" PointUnitFrom:"ChargeTotalEnergyUnit" PointUpdateFreq:"UpdateFreqTotal"` - ChargeTotalEnergyUnit valueTypes.String `json:"charge_total_energy_unit" PointIgnore:"true"` - DisChargeTotalEnergy valueTypes.Float `json:"dis_charge_total_energy" PointUnitFrom:"DisChargeTotalEnergyUnit" PointUpdateFreq:"UpdateFreqTotal"` - DisChargeTotalEnergyUnit valueTypes.String `json:"dis_charge_total_energy_unit" PointIgnore:"true"` - PercentPlanYear valueTypes.Float `json:"percent_plan_year" PointUnit:"%" PointUpdateFreq:"UpdateFreqYear"` - PercentPlanMonth valueTypes.Float `json:"percent_plan_month" PointUnit:"%" PointUpdateFreq:"UpdateFreqMonth"` + ActualEnergy []valueTypes.Float `json:"actual_energy" PointUnitFrom:"ActualEnergyUnit" DataTable:"true" DataTableMerge:"true" DataTableIndex:"true"` + ActualEnergyUnit valueTypes.String `json:"actual_energy_unit" PointIgnore:"true"` + PlanEnergy []valueTypes.Float `json:"plan_energy" PointUnitFrom:"PlanEnergyUnit" DataTable:"true" DataTableMerge:"true" DataTableIndex:"true"` + PlanEnergyUnit valueTypes.String `json:"plan_energy_unit" PointIgnore:"true"` + + OrgName valueTypes.String `json:"org_name"` + PsCount valueTypes.Integer `json:"ps_count"` + TotalCapacity valueTypes.UnitValue `json:"total_capcity" PointId:"total_capacity" PointUpdateFreq:"UpdateFreqTotal"` + TotalDesignCapacity valueTypes.UnitValue `json:"total_design_capacity" PointUpdateFreq:"UpdateFreqTotal"` + + P83024 valueTypes.Float `json:"p83024" PointUnit:"Wh" PointVirtual:"true"` + TodayEnergy valueTypes.UnitValue `json:"today_energy" PointUpdateFreq:"UpdateFreqTotal"` + MonthEnergy valueTypes.UnitValue `json:"month_energy" PointUpdateFreq:"UpdateFreqMonth"` + YearEnergy valueTypes.UnitValue `json:"year_energy" PointUpdateFreq:"UpdateFreqYear"` + TotalEnergy valueTypes.UnitValue `json:"total_energy" PointUpdateFreq:"UpdateFreqTotal"` + + ChargeTotalEnergy valueTypes.Float `json:"charge_total_energy" PointUnitFrom:"ChargeTotalEnergyUnit" PointUpdateFreq:"UpdateFreqTotal"` + ChargeTotalEnergyUnit valueTypes.String `json:"charge_total_energy_unit" PointIgnore:"true"` + DisChargeTotalEnergy valueTypes.Float `json:"dis_charge_total_energy" PointUnitFrom:"DisChargeTotalEnergyUnit" PointUpdateFreq:"UpdateFreqTotal"` + DisChargeTotalEnergyUnit valueTypes.String `json:"dis_charge_total_energy_unit" PointIgnore:"true"` + PercentPlanYear valueTypes.Float `json:"percent_plan_year" PointUnit:"%" PointUpdateFreq:"UpdateFreqYear"` + PercentPlanMonth valueTypes.Float `json:"percent_plan_month" PointUnit:"%" PointUpdateFreq:"UpdateFreqMonth"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getKpiInfo/struct.go b/iSolarCloud/AppService/getKpiInfo/struct.go index 0e4b8b9d3..32a8576f0 100644 --- a/iSolarCloud/AppService/getKpiInfo/struct.go +++ b/iSolarCloud/AppService/getKpiInfo/struct.go @@ -5,9 +5,9 @@ package getKpiInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getListMiFromHBase/data.go b/iSolarCloud/AppService/getListMiFromHBase/data.go index c99215ee0..808ccf221 100644 --- a/iSolarCloud/AppService/getListMiFromHBase/data.go +++ b/iSolarCloud/AppService/getListMiFromHBase/data.go @@ -1,11 +1,12 @@ package getListMiFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -27,7 +28,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getListMiFromHBase/struct.go b/iSolarCloud/AppService/getListMiFromHBase/struct.go index d157c3283..dc959e441 100644 --- a/iSolarCloud/AppService/getListMiFromHBase/struct.go +++ b/iSolarCloud/AppService/getListMiFromHBase/struct.go @@ -5,9 +5,9 @@ package getListMiFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getMapInfo/data.go b/iSolarCloud/AppService/getMapInfo/data.go index d95a15cdf..64aa83ea1 100644 --- a/iSolarCloud/AppService/getMapInfo/data.go +++ b/iSolarCloud/AppService/getMapInfo/data.go @@ -1,9 +1,10 @@ package getMapInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getMapInfo/struct.go b/iSolarCloud/AppService/getMapInfo/struct.go index 060a47436..0af411c4a 100644 --- a/iSolarCloud/AppService/getMapInfo/struct.go +++ b/iSolarCloud/AppService/getMapInfo/struct.go @@ -5,9 +5,9 @@ package getMapInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getMapMiFromHBase/data.go b/iSolarCloud/AppService/getMapMiFromHBase/data.go index 3c94433c3..9d6f5f346 100644 --- a/iSolarCloud/AppService/getMapMiFromHBase/data.go +++ b/iSolarCloud/AppService/getMapMiFromHBase/data.go @@ -1,11 +1,12 @@ package getMapMiFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getMapMiFromHBase" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getMapMiFromHBase/struct.go b/iSolarCloud/AppService/getMapMiFromHBase/struct.go index 9b3f91a7a..5acd84b16 100644 --- a/iSolarCloud/AppService/getMapMiFromHBase/struct.go +++ b/iSolarCloud/AppService/getMapMiFromHBase/struct.go @@ -5,9 +5,9 @@ package getMapMiFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getMenuAndPrivileges/data.go b/iSolarCloud/AppService/getMenuAndPrivileges/data.go index 8ef27451f..61d5940a5 100644 --- a/iSolarCloud/AppService/getMenuAndPrivileges/data.go +++ b/iSolarCloud/AppService/getMenuAndPrivileges/data.go @@ -1,11 +1,12 @@ package getMenuAndPrivileges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getMenuAndPrivileges" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getMenuAndPrivileges/struct.go b/iSolarCloud/AppService/getMenuAndPrivileges/struct.go index 3e290ca37..52fc8222d 100644 --- a/iSolarCloud/AppService/getMenuAndPrivileges/struct.go +++ b/iSolarCloud/AppService/getMenuAndPrivileges/struct.go @@ -5,9 +5,9 @@ package getMenuAndPrivileges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go b/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go index 9f30f5fd6..2c3f80128 100644 --- a/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go +++ b/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go @@ -1,11 +1,12 @@ package getMicrogridEStoragePsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getMicrogridEStoragePsReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go b/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go index a33981f4f..ed203e607 100644 --- a/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go +++ b/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go @@ -5,9 +5,9 @@ package getMicrogridEStoragePsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getModuleLogInfo/data.go b/iSolarCloud/AppService/getModuleLogInfo/data.go index 31f66f82c..026c2ede2 100644 --- a/iSolarCloud/AppService/getModuleLogInfo/data.go +++ b/iSolarCloud/AppService/getModuleLogInfo/data.go @@ -1,11 +1,12 @@ package getModuleLogInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/getModuleLogInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getModuleLogInfo/struct.go b/iSolarCloud/AppService/getModuleLogInfo/struct.go index e8baa792f..c14764165 100644 --- a/iSolarCloud/AppService/getModuleLogInfo/struct.go +++ b/iSolarCloud/AppService/getModuleLogInfo/struct.go @@ -5,9 +5,9 @@ package getModuleLogInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getModuleLogTaskList/data.go b/iSolarCloud/AppService/getModuleLogTaskList/data.go index 3b0d0e692..6b34cfdce 100644 --- a/iSolarCloud/AppService/getModuleLogTaskList/data.go +++ b/iSolarCloud/AppService/getModuleLogTaskList/data.go @@ -1,10 +1,11 @@ package getModuleLogTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -29,7 +30,7 @@ type ResultData struct { IsMore valueTypes.Bool `json:"isMore" PointId:"is_more"` PageList []struct { // PointIdFromChild:"TaskId" PointIdReplace:"true" - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"TaskId" PointNameDateFormat:"DateTimeAltLayout" PointTimestampFrom:"CreateTime"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"TaskId" PointNameDateFormat:"DateTimeAltLayout" PointTimestampFrom:"CreateTime"` TaskId valueTypes.Integer `json:"task_id"` CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` diff --git a/iSolarCloud/AppService/getModuleLogTaskList/struct.go b/iSolarCloud/AppService/getModuleLogTaskList/struct.go index c34e6fb00..c1f99b8e5 100644 --- a/iSolarCloud/AppService/getModuleLogTaskList/struct.go +++ b/iSolarCloud/AppService/getModuleLogTaskList/struct.go @@ -5,9 +5,9 @@ package getModuleLogTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getNationProvJSON/data.go b/iSolarCloud/AppService/getNationProvJSON/data.go index f056962f3..3c06f5d42 100644 --- a/iSolarCloud/AppService/getNationProvJSON/data.go +++ b/iSolarCloud/AppService/getNationProvJSON/data.go @@ -1,11 +1,12 @@ package getNationProvJSON import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getNationProvJSON" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getNationProvJSON/struct.go b/iSolarCloud/AppService/getNationProvJSON/struct.go index d01078d64..9fe23e3d4 100644 --- a/iSolarCloud/AppService/getNationProvJSON/struct.go +++ b/iSolarCloud/AppService/getNationProvJSON/struct.go @@ -5,9 +5,9 @@ package getNationProvJSON import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go index 2aabd22d4..76a341194 100644 --- a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go +++ b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go @@ -1,11 +1,12 @@ package getNeedOpAsynOpRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getNeedOpAsynOpRecordList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go index 370d8ebf8..616b93e79 100644 --- a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go +++ b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go @@ -5,9 +5,9 @@ package getNeedOpAsynOpRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getNoticeInfo/data.go b/iSolarCloud/AppService/getNoticeInfo/data.go index 10e5e761f..a24d46b53 100644 --- a/iSolarCloud/AppService/getNoticeInfo/data.go +++ b/iSolarCloud/AppService/getNoticeInfo/data.go @@ -1,11 +1,12 @@ package getNoticeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getNoticeInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getNoticeInfo/struct.go b/iSolarCloud/AppService/getNoticeInfo/struct.go index 7bf5f5122..9c70695e8 100644 --- a/iSolarCloud/AppService/getNoticeInfo/struct.go +++ b/iSolarCloud/AppService/getNoticeInfo/struct.go @@ -5,9 +5,9 @@ package getNoticeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getNumberOfServiceCalls/data.go b/iSolarCloud/AppService/getNumberOfServiceCalls/data.go index 6b87a9e2b..ea752a5b8 100644 --- a/iSolarCloud/AppService/getNumberOfServiceCalls/data.go +++ b/iSolarCloud/AppService/getNumberOfServiceCalls/data.go @@ -1,11 +1,12 @@ package getNumberOfServiceCalls import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getNumberOfServiceCalls" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go b/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go index 36851d3b9..a29f4e580 100644 --- a/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go +++ b/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go @@ -5,9 +5,9 @@ package getNumberOfServiceCalls import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOSSConfig/data.go b/iSolarCloud/AppService/getOSSConfig/data.go index 702f45ea1..4e2fc504c 100644 --- a/iSolarCloud/AppService/getOSSConfig/data.go +++ b/iSolarCloud/AppService/getOSSConfig/data.go @@ -1,11 +1,12 @@ package getOSSConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getOSSConfig" @@ -24,17 +25,16 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { - AccessId valueTypes.String `json:"accessid"` - Dir valueTypes.String `json:"dir"` - Expire valueTypes.Integer `json:"expire"` - Host valueTypes.String `json:"host"` - IsPrivateCloud valueTypes.Bool `json:"is_private_cloud"` - OssFileURL valueTypes.String `json:"oss_file_url"` - Policy valueTypes.String `json:"policy"` - SguZipDir valueTypes.String `json:"sgu_zip_dir"` - Signature valueTypes.String `json:"signature"` + AccessId valueTypes.String `json:"accessid"` + Dir valueTypes.String `json:"dir"` + Expire valueTypes.Integer `json:"expire"` + Host valueTypes.String `json:"host"` + IsPrivateCloud valueTypes.Bool `json:"is_private_cloud"` + OssFileURL valueTypes.String `json:"oss_file_url"` + Policy valueTypes.String `json:"policy"` + SguZipDir valueTypes.String `json:"sgu_zip_dir"` + Signature valueTypes.String `json:"signature"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getOSSConfig/struct.go b/iSolarCloud/AppService/getOSSConfig/struct.go index 4a40c7578..2c4f9b51c 100644 --- a/iSolarCloud/AppService/getOSSConfig/struct.go +++ b/iSolarCloud/AppService/getOSSConfig/struct.go @@ -5,9 +5,9 @@ package getOSSConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOperRuleDetail/data.go b/iSolarCloud/AppService/getOperRuleDetail/data.go index 13131b35d..89048d109 100644 --- a/iSolarCloud/AppService/getOperRuleDetail/data.go +++ b/iSolarCloud/AppService/getOperRuleDetail/data.go @@ -1,11 +1,12 @@ package getOperRuleDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOperRuleDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOperRuleDetail/struct.go b/iSolarCloud/AppService/getOperRuleDetail/struct.go index 2224ab10c..a510ba74e 100644 --- a/iSolarCloud/AppService/getOperRuleDetail/struct.go +++ b/iSolarCloud/AppService/getOperRuleDetail/struct.go @@ -5,9 +5,9 @@ package getOperRuleDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOperateBillFileId/data.go b/iSolarCloud/AppService/getOperateBillFileId/data.go index 24122d168..90e461963 100644 --- a/iSolarCloud/AppService/getOperateBillFileId/data.go +++ b/iSolarCloud/AppService/getOperateBillFileId/data.go @@ -1,11 +1,12 @@ package getOperateBillFileId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOperateBillFileId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOperateBillFileId/struct.go b/iSolarCloud/AppService/getOperateBillFileId/struct.go index a5586117c..8edca53e6 100644 --- a/iSolarCloud/AppService/getOperateBillFileId/struct.go +++ b/iSolarCloud/AppService/getOperateBillFileId/struct.go @@ -5,9 +5,9 @@ package getOperateBillFileId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOperateTicketForDetail/data.go b/iSolarCloud/AppService/getOperateTicketForDetail/data.go index 5db66104e..7e68c4fc6 100644 --- a/iSolarCloud/AppService/getOperateTicketForDetail/data.go +++ b/iSolarCloud/AppService/getOperateTicketForDetail/data.go @@ -1,11 +1,12 @@ package getOperateTicketForDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOperateTicketForDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOperateTicketForDetail/struct.go b/iSolarCloud/AppService/getOperateTicketForDetail/struct.go index e5defa58f..ac48dd731 100644 --- a/iSolarCloud/AppService/getOperateTicketForDetail/struct.go +++ b/iSolarCloud/AppService/getOperateTicketForDetail/struct.go @@ -5,9 +5,9 @@ package getOperateTicketForDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go index e3574d6b8..227763494 100644 --- a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go +++ b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go @@ -1,11 +1,12 @@ package getOrCreateNetEaseUserToken import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getOrCreateNetEaseUserToken" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go index 81d8d6b86..4a49ea0b4 100644 --- a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go +++ b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go @@ -5,9 +5,9 @@ package getOrCreateNetEaseUserToken import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrderDataList/data.go b/iSolarCloud/AppService/getOrderDataList/data.go index b9fbdf4ed..dc2d461af 100644 --- a/iSolarCloud/AppService/getOrderDataList/data.go +++ b/iSolarCloud/AppService/getOrderDataList/data.go @@ -1,11 +1,12 @@ package getOrderDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOrderDataList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrderDataList/struct.go b/iSolarCloud/AppService/getOrderDataList/struct.go index 2066da221..ec21166ac 100644 --- a/iSolarCloud/AppService/getOrderDataList/struct.go +++ b/iSolarCloud/AppService/getOrderDataList/struct.go @@ -5,9 +5,9 @@ package getOrderDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrderDataSql2/data.go b/iSolarCloud/AppService/getOrderDataSql2/data.go index 3fd2f464a..74754ae39 100644 --- a/iSolarCloud/AppService/getOrderDataSql2/data.go +++ b/iSolarCloud/AppService/getOrderDataSql2/data.go @@ -1,11 +1,12 @@ package getOrderDataSql2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getOrderDataSql2" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrderDataSql2/struct.go b/iSolarCloud/AppService/getOrderDataSql2/struct.go index 480f1dbb8..07e6ea09c 100644 --- a/iSolarCloud/AppService/getOrderDataSql2/struct.go +++ b/iSolarCloud/AppService/getOrderDataSql2/struct.go @@ -5,9 +5,9 @@ package getOrderDataSql2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrderDatas/data.go b/iSolarCloud/AppService/getOrderDatas/data.go index d8d7bc2ee..6eb2898c0 100644 --- a/iSolarCloud/AppService/getOrderDatas/data.go +++ b/iSolarCloud/AppService/getOrderDatas/data.go @@ -1,11 +1,12 @@ package getOrderDatas import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getOrderDatas" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrderDatas/struct.go b/iSolarCloud/AppService/getOrderDatas/struct.go index ef5d11d2d..e6dd428b9 100644 --- a/iSolarCloud/AppService/getOrderDatas/struct.go +++ b/iSolarCloud/AppService/getOrderDatas/struct.go @@ -5,9 +5,9 @@ package getOrderDatas import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrderDetail/data.go b/iSolarCloud/AppService/getOrderDetail/data.go index de5dca03d..793e432a6 100644 --- a/iSolarCloud/AppService/getOrderDetail/data.go +++ b/iSolarCloud/AppService/getOrderDetail/data.go @@ -1,11 +1,12 @@ package getOrderDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrderDetail/struct.go b/iSolarCloud/AppService/getOrderDetail/struct.go index 45c664229..55658b5d7 100644 --- a/iSolarCloud/AppService/getOrderDetail/struct.go +++ b/iSolarCloud/AppService/getOrderDetail/struct.go @@ -5,9 +5,9 @@ package getOrderDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrderStatistics/data.go b/iSolarCloud/AppService/getOrderStatistics/data.go index 4e83a2bc8..0ea5f56d6 100644 --- a/iSolarCloud/AppService/getOrderStatistics/data.go +++ b/iSolarCloud/AppService/getOrderStatistics/data.go @@ -1,11 +1,12 @@ package getOrderStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOrderStatistics" @@ -24,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { ProcessedCount valueTypes.Integer `json:"processed_count"` ProcessingCount valueTypes.Integer `json:"processing_count"` UnProcessCount valueTypes.Integer `json:"un_process_count"` diff --git a/iSolarCloud/AppService/getOrderStatistics/struct.go b/iSolarCloud/AppService/getOrderStatistics/struct.go index d14380adc..edb3d199f 100644 --- a/iSolarCloud/AppService/getOrderStatistics/struct.go +++ b/iSolarCloud/AppService/getOrderStatistics/struct.go @@ -5,9 +5,9 @@ package getOrderStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrgIdNameByUserId/data.go b/iSolarCloud/AppService/getOrgIdNameByUserId/data.go index 60ca6ef72..17d6b2b4f 100644 --- a/iSolarCloud/AppService/getOrgIdNameByUserId/data.go +++ b/iSolarCloud/AppService/getOrgIdNameByUserId/data.go @@ -1,11 +1,12 @@ package getOrgIdNameByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgIdNameByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go b/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go index dbc3a8894..df7621e93 100644 --- a/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go +++ b/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go @@ -5,9 +5,9 @@ package getOrgIdNameByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go index 4c9461206..0c850401a 100644 --- a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go +++ b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go @@ -1,11 +1,12 @@ package getOrgInfoByDealerOrgCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgInfoByDealerOrgCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go index 34b48280b..a405d8dbf 100644 --- a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go +++ b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go @@ -5,9 +5,9 @@ package getOrgInfoByDealerOrgCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrgListByName/data.go b/iSolarCloud/AppService/getOrgListByName/data.go index 584e9def5..f9641674d 100644 --- a/iSolarCloud/AppService/getOrgListByName/data.go +++ b/iSolarCloud/AppService/getOrgListByName/data.go @@ -1,11 +1,12 @@ package getOrgListByName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgListByName" diff --git a/iSolarCloud/AppService/getOrgListByName/struct.go b/iSolarCloud/AppService/getOrgListByName/struct.go index 7861ee85a..c26d27159 100644 --- a/iSolarCloud/AppService/getOrgListByName/struct.go +++ b/iSolarCloud/AppService/getOrgListByName/struct.go @@ -5,9 +5,9 @@ package getOrgListByName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrgListByUserId/data.go b/iSolarCloud/AppService/getOrgListByUserId/data.go index afb7d1bd5..a374c87d3 100644 --- a/iSolarCloud/AppService/getOrgListByUserId/data.go +++ b/iSolarCloud/AppService/getOrgListByUserId/data.go @@ -1,11 +1,12 @@ package getOrgListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getOrgListByUserId" @@ -24,10 +25,9 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { - Depth valueTypes.Integer `json:"depth"` - List []interface{} `json:"list"` +type ResultData struct { + Depth valueTypes.Integer `json:"depth"` + List []interface{} `json:"list"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getOrgListByUserId/struct.go b/iSolarCloud/AppService/getOrgListByUserId/struct.go index ca76d6238..c8a50b058 100644 --- a/iSolarCloud/AppService/getOrgListByUserId/struct.go +++ b/iSolarCloud/AppService/getOrgListByUserId/struct.go @@ -5,9 +5,9 @@ package getOrgListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOrgListForUser/data.go b/iSolarCloud/AppService/getOrgListForUser/data.go index 2b57f8395..9afd60686 100644 --- a/iSolarCloud/AppService/getOrgListForUser/data.go +++ b/iSolarCloud/AppService/getOrgListForUser/data.go @@ -1,11 +1,12 @@ package getOrgListForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgListForUser" @@ -29,7 +30,7 @@ type ResultData []struct { GcjLongitude valueTypes.Float `json:"gcj_longitude"` Id valueTypes.Integer `json:"id"` IsLeaf valueTypes.Bool `json:"is_leaf"` - MapLevel interface{} `json:"map_level"` + MapLevel interface{} `json:"map_level"` OrgId valueTypes.Integer `json:"org_id"` OrgIndexCode valueTypes.String `json:"org_index_code"` OrgIsShow valueTypes.Integer `json:"org_is_show"` diff --git a/iSolarCloud/AppService/getOrgListForUser/struct.go b/iSolarCloud/AppService/getOrgListForUser/struct.go index cfdbe7b3d..756e6e684 100644 --- a/iSolarCloud/AppService/getOrgListForUser/struct.go +++ b/iSolarCloud/AppService/getOrgListForUser/struct.go @@ -5,9 +5,9 @@ package getOrgListForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOssObjectStream/data.go b/iSolarCloud/AppService/getOssObjectStream/data.go index f7de33a0b..a1d9616a0 100644 --- a/iSolarCloud/AppService/getOssObjectStream/data.go +++ b/iSolarCloud/AppService/getOssObjectStream/data.go @@ -1,11 +1,12 @@ package getOssObjectStream import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getOssObjectStream" @@ -24,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { Inputstream valueTypes.String `json:"inputstream"` } diff --git a/iSolarCloud/AppService/getOssObjectStream/struct.go b/iSolarCloud/AppService/getOssObjectStream/struct.go index 0f7fde7b2..861af0582 100644 --- a/iSolarCloud/AppService/getOssObjectStream/struct.go +++ b/iSolarCloud/AppService/getOssObjectStream/struct.go @@ -5,9 +5,9 @@ package getOssObjectStream import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getOwnerFaultConfigList/data.go b/iSolarCloud/AppService/getOwnerFaultConfigList/data.go index f65c471cc..eb883447a 100644 --- a/iSolarCloud/AppService/getOwnerFaultConfigList/data.go +++ b/iSolarCloud/AppService/getOwnerFaultConfigList/data.go @@ -1,11 +1,12 @@ package getOwnerFaultConfigList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"FaultTypeId" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"FaultTypeId" PointIdReplace:"true"` FaultTypeId valueTypes.Integer `json:"fault_type_id"` FaultTypeCode valueTypes.Integer `json:"fault_type_code"` @@ -35,10 +36,10 @@ type ResultData struct { FaultLevel valueTypes.Integer `json:"fault_level"` FaultType valueTypes.Integer `json:"fault_type"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceTypeName valueTypes.String `json:"device_type_name"` - DevFaultTypeCode valueTypes.String `json:"dev_fault_type_code"` - NewFaultTypeCode valueTypes.Integer `json:"new_fault_type_code"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceTypeName valueTypes.String `json:"device_type_name"` + DevFaultTypeCode valueTypes.String `json:"dev_fault_type_code"` + NewFaultTypeCode valueTypes.Integer `json:"new_fault_type_code"` IsAllowOwnerView valueTypes.Bool `json:"is_allow_owner_view"` IsAllowUserAdd valueTypes.Bool `json:"is_allow_user_add"` diff --git a/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go b/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go index 1c0b60c45..09da49cf1 100644 --- a/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go +++ b/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go @@ -5,9 +5,9 @@ package getOwnerFaultConfigList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPListinfoFromMysql/data.go b/iSolarCloud/AppService/getPListinfoFromMysql/data.go index 4c394f7b6..01963da4a 100644 --- a/iSolarCloud/AppService/getPListinfoFromMysql/data.go +++ b/iSolarCloud/AppService/getPListinfoFromMysql/data.go @@ -1,20 +1,22 @@ package getPListinfoFromMysql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPListinfoFromMysql" const Disabled = false const EndPointName = "AppService.getPListinfoFromMysql" + // ./goraw.sh AppService.getPListinfoFromMysql '{"psIds":1171348}' type RequestData struct { - PsIds valueTypes.PsIds `json:"psIds" required:"true"` + PsIds valueTypes.PsIds `json:"psIds" required:"true"` } func (rd RequestData) IsValid() error { diff --git a/iSolarCloud/AppService/getPListinfoFromMysql/struct.go b/iSolarCloud/AppService/getPListinfoFromMysql/struct.go index 1b89d90d1..9e69c4ee6 100644 --- a/iSolarCloud/AppService/getPListinfoFromMysql/struct.go +++ b/iSolarCloud/AppService/getPListinfoFromMysql/struct.go @@ -5,9 +5,9 @@ package getPListinfoFromMysql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go index 44515046d..207d7a776 100644 --- a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go +++ b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go @@ -1,11 +1,12 @@ package getParamSetTemplate4NewProtocol import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getParamSetTemplate4NewProtocol" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go index 5a0d33eff..f3341453a 100644 --- a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go +++ b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go @@ -5,9 +5,9 @@ package getParamSetTemplate4NewProtocol import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go b/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go index eb2abe7d7..4fa162721 100644 --- a/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go +++ b/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go @@ -1,9 +1,9 @@ package getParamSetTemplatePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,8 +13,8 @@ const Disabled = false const EndPointName = "AppService.getParamSetTemplatePointInfo" type RequestData struct { - UuidList valueTypes.String `json:"uuid_list" required:"true"` - SetType valueTypes.String `json:"set_type" required:"true"` + UuidList valueTypes.String `json:"uuid_list" required:"true"` + SetType valueTypes.String `json:"set_type" required:"true"` } func (rd RequestData) IsValid() error { @@ -29,7 +29,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } @@ -38,7 +37,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, "", GoStruct.EndPointPath{}) diff --git a/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go b/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go index 04c40b316..07acefc9b 100644 --- a/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go +++ b/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go @@ -5,9 +5,9 @@ package getParamSetTemplatePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getParamterSettingBase/data.go b/iSolarCloud/AppService/getParamterSettingBase/data.go index acee964fe..e106ec8e3 100644 --- a/iSolarCloud/AppService/getParamterSettingBase/data.go +++ b/iSolarCloud/AppService/getParamterSettingBase/data.go @@ -1,11 +1,12 @@ package getParamterSettingBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getParamterSettingBase" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getParamterSettingBase/struct.go b/iSolarCloud/AppService/getParamterSettingBase/struct.go index 78ab4ae43..d07e7c4a7 100644 --- a/iSolarCloud/AppService/getParamterSettingBase/struct.go +++ b/iSolarCloud/AppService/getParamterSettingBase/struct.go @@ -5,9 +5,9 @@ package getParamterSettingBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPhotoInfo/data.go b/iSolarCloud/AppService/getPhotoInfo/data.go index 363cb15d1..ceb9c0db5 100644 --- a/iSolarCloud/AppService/getPhotoInfo/data.go +++ b/iSolarCloud/AppService/getPhotoInfo/data.go @@ -1,9 +1,10 @@ package getPhotoInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,8 +24,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { PhotoInf []interface{} `json:"photoInf"` } diff --git a/iSolarCloud/AppService/getPhotoInfo/struct.go b/iSolarCloud/AppService/getPhotoInfo/struct.go index 39113dda1..500f5beb4 100644 --- a/iSolarCloud/AppService/getPhotoInfo/struct.go +++ b/iSolarCloud/AppService/getPhotoInfo/struct.go @@ -5,9 +5,9 @@ package getPhotoInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPlanedOrNotPsList/data.go b/iSolarCloud/AppService/getPlanedOrNotPsList/data.go index 364152cc5..487fb1b60 100644 --- a/iSolarCloud/AppService/getPlanedOrNotPsList/data.go +++ b/iSolarCloud/AppService/getPlanedOrNotPsList/data.go @@ -1,11 +1,12 @@ package getPlanedOrNotPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getPlanedOrNotPsList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go b/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go index 3509c5957..6dc4745b3 100644 --- a/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go +++ b/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go @@ -5,9 +5,9 @@ package getPlanedOrNotPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPlantReportPDFList/data.go b/iSolarCloud/AppService/getPlantReportPDFList/data.go index 3535696c3..04f0e41ba 100644 --- a/iSolarCloud/AppService/getPlantReportPDFList/data.go +++ b/iSolarCloud/AppService/getPlantReportPDFList/data.go @@ -1,9 +1,9 @@ package getPlantReportPDFList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/AppService/getPlantReportPDFList/struct.go b/iSolarCloud/AppService/getPlantReportPDFList/struct.go index a8b42380d..7d4847176 100644 --- a/iSolarCloud/AppService/getPlantReportPDFList/struct.go +++ b/iSolarCloud/AppService/getPlantReportPDFList/struct.go @@ -5,9 +5,9 @@ package getPlantReportPDFList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go b/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go index 2f70cad1d..36dd91987 100644 --- a/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go +++ b/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go @@ -1,10 +1,11 @@ package getPowerChargeSettingInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go b/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go index f436fc1f0..67446afd5 100644 --- a/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go +++ b/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go @@ -5,9 +5,9 @@ package getPowerChargeSettingInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go b/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go index 815c763bf..2530e963b 100644 --- a/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go +++ b/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go @@ -1,11 +1,12 @@ package getPowerDeviceModelTechList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerDeviceModelTechList" @@ -63,10 +64,10 @@ func (rd RequestData) Help() string { type ResultData []struct { CodeId valueTypes.Integer `json:"code_id"` - CodeName string `json:"code_name"` - CodeValue string `json:"code_value"` - DefaultValue interface{} `json:"default_value"` - TechDescription string `json:"tech_description"` + CodeName string `json:"code_name"` + CodeValue string `json:"code_value"` + DefaultValue interface{} `json:"default_value"` + TechDescription string `json:"tech_description"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go b/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go index 9ebd739ba..4e051ed69 100644 --- a/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go +++ b/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceModelTechList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDeviceModelTree/data.go b/iSolarCloud/AppService/getPowerDeviceModelTree/data.go index 60b38d514..cebe1018b 100644 --- a/iSolarCloud/AppService/getPowerDeviceModelTree/data.go +++ b/iSolarCloud/AppService/getPowerDeviceModelTree/data.go @@ -1,11 +1,12 @@ package getPowerDeviceModelTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go b/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go index 1d74beb02..0a2a8e008 100644 --- a/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go +++ b/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceModelTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDevicePointInfo/data.go b/iSolarCloud/AppService/getPowerDevicePointInfo/data.go index e4e260d45..a74206bfb 100644 --- a/iSolarCloud/AppService/getPowerDevicePointInfo/data.go +++ b/iSolarCloud/AppService/getPowerDevicePointInfo/data.go @@ -1,10 +1,10 @@ package getPowerDevicePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -28,17 +28,16 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"Id"` - DeviceType valueTypes.Integer `json:"device_type" PointId:"device_type" PointValueType:"" PointUpdateFreq:""` - Id valueTypes.Integer `json:"id" PointId:"id" PointValueType:"" PointUpdateFreq:""` - Period valueTypes.Integer `json:"period" PointId:"period" PointValueType:"" PointUpdateFreq:""` - PointId valueTypes.Integer `json:"point_id" PointId:"point_id" PointValueType:"" PointUpdateFreq:""` - PointName valueTypes.String `json:"point_name" PointId:"point_name" PointValueType:"" PointUpdateFreq:""` - ShowPointName valueTypes.String `json:"show_point_name" PointId:"show_point_name" PointValueType:"" PointUpdateFreq:""` - TranslationId valueTypes.Integer `json:"translation_id" PointId:"translation_id" PointValueType:"" PointUpdateFreq:""` + DeviceType valueTypes.Integer `json:"device_type" PointId:"device_type" PointValueType:"" PointUpdateFreq:""` + Id valueTypes.Integer `json:"id" PointId:"id" PointValueType:"" PointUpdateFreq:""` + Period valueTypes.Integer `json:"period" PointId:"period" PointValueType:"" PointUpdateFreq:""` + PointId valueTypes.Integer `json:"point_id" PointId:"point_id" PointValueType:"" PointUpdateFreq:""` + PointName valueTypes.String `json:"point_name" PointId:"point_name" PointValueType:"" PointUpdateFreq:""` + ShowPointName valueTypes.String `json:"show_point_name" PointId:"show_point_name" PointValueType:"" PointUpdateFreq:""` + TranslationId valueTypes.Integer `json:"translation_id" PointId:"translation_id" PointValueType:"" PointUpdateFreq:""` } func (e *ResultData) IsValid() error { @@ -61,7 +60,7 @@ func (e *EndPoint) AddDataTable(table output.Table) output.Table { rd.PointName.String(), rd.ShowPointName.String(), rd.TranslationId.String(), - ) + ) } return table } @@ -99,12 +98,11 @@ func (e *EndPoint) GetPointDataTable() output.Table { rd.PointName.String(), rd.ShowPointName.String(), rd.TranslationId.String(), - ) + ) } return table } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, "", GoStruct.EndPointPath{}) diff --git a/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go b/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go index 862b59040..981c8cfe8 100644 --- a/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go +++ b/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go @@ -5,9 +5,9 @@ package getPowerDevicePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,15 +16,14 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) // EndPoint - Holds the request, response and web method structures. type EndPoint struct { api.EndPointStruct - Request Request - Response Response + Request Request + Response Response RawResponse []byte } @@ -55,7 +54,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -77,18 +75,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -169,7 +168,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -243,7 +241,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -299,7 +296,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -323,7 +319,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -363,7 +358,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -395,4 +389,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDevicePointNames/data.go b/iSolarCloud/AppService/getPowerDevicePointNames/data.go index c016caa3d..a867daab1 100644 --- a/iSolarCloud/AppService/getPowerDevicePointNames/data.go +++ b/iSolarCloud/AppService/getPowerDevicePointNames/data.go @@ -1,10 +1,10 @@ package getPowerDevicePointNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -78,9 +78,9 @@ type ResultData []Point type Point struct { GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` - PointId valueTypes.Integer `json:"point_id"` - PointName valueTypes.String `json:"point_name"` - PointCalType valueTypes.Integer `json:"point_cal_type"` + PointId valueTypes.Integer `json:"point_id"` + PointName valueTypes.String `json:"point_name"` + PointCalType valueTypes.Integer `json:"point_cal_type"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getPowerDevicePointNames/struct.go b/iSolarCloud/AppService/getPowerDevicePointNames/struct.go index 38a9d5fee..03412f4e0 100644 --- a/iSolarCloud/AppService/getPowerDevicePointNames/struct.go +++ b/iSolarCloud/AppService/getPowerDevicePointNames/struct.go @@ -5,9 +5,9 @@ package getPowerDevicePointNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go index c0f659612..ec2490ba0 100644 --- a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go +++ b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go @@ -1,10 +1,11 @@ package getPowerDeviceSetTaskDetailList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPowerDeviceSetTaskDetailList" @@ -65,13 +66,13 @@ type ResultData struct { } `json:"device_list" DataTable:"true" DataTableIndex:"true"` PageList []struct { // GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsId"` - GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true"` + GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true"` - PsId valueTypes.Integer `json:"ps_id"` - PsName valueTypes.String `json:"ps_name"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` - DeviceType valueTypes.Integer `json:"device_type"` - Sn valueTypes.String `json:"sn"` + PsId valueTypes.Integer `json:"ps_id"` + PsName valueTypes.String `json:"ps_name"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + DeviceType valueTypes.Integer `json:"device_type"` + Sn valueTypes.String `json:"sn"` PointId valueTypes.Integer `json:"point_id"` PointIdType valueTypes.Integer `json:"point_id_type"` diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go index b3c0a54ac..4c4b74bf1 100644 --- a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go +++ b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceSetTaskDetailList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go index e4ab1c092..2259387d2 100644 --- a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go +++ b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go @@ -1,10 +1,11 @@ package getPowerDeviceSetTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPowerDeviceSetTaskList" @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"GoStruct" PointIdFrom:"TaskId" PointIdReplace:"true" PointDeviceFrom:"PsId"` + GoStruct GoStruct.GoStruct `json:"GoStruct" PointIdFrom:"TaskId" PointIdReplace:"true" PointDeviceFrom:"PsId"` TaskId valueTypes.Integer `json:"task_id"` TaskType valueTypes.Integer `json:"task_type"` diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go b/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go index ef232bf57..135e6e409 100644 --- a/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go +++ b/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceSetTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go index 2c3e1b002..7a5bdaeeb 100644 --- a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go +++ b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go @@ -1,11 +1,12 @@ package getPowerFormulaFaultAnalyse import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerFormulaFaultAnalyse" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go index 2d470f959..a178f5cb0 100644 --- a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go +++ b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go @@ -5,9 +5,9 @@ package getPowerFormulaFaultAnalyse import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerPictureList/data.go b/iSolarCloud/AppService/getPowerPictureList/data.go index a43e78982..ab9b9d748 100644 --- a/iSolarCloud/AppService/getPowerPictureList/data.go +++ b/iSolarCloud/AppService/getPowerPictureList/data.go @@ -1,9 +1,10 @@ package getPowerPictureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPowerPictureList/struct.go b/iSolarCloud/AppService/getPowerPictureList/struct.go index a7ef791f7..5a830d22e 100644 --- a/iSolarCloud/AppService/getPowerPictureList/struct.go +++ b/iSolarCloud/AppService/getPowerPictureList/struct.go @@ -5,9 +5,9 @@ package getPowerPictureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go index b20ed799f..60a32260d 100644 --- a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go +++ b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go @@ -1,11 +1,12 @@ package getPowerRobotInfoByRobotSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerRobotInfoByRobotSn" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go index 538d9dd4e..81085112b 100644 --- a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go +++ b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go @@ -5,9 +5,9 @@ package getPowerRobotInfoByRobotSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go index 25e516de7..b60e9a055 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go +++ b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go @@ -1,11 +1,12 @@ package getPowerRobotSweepAttrByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerRobotSweepAttrByPsId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go index 491e17e18..38f997ead 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go +++ b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go @@ -5,9 +5,9 @@ package getPowerRobotSweepAttrByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go index cff832fe7..f97a46db8 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go +++ b/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go @@ -1,10 +1,11 @@ package getPowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go index 37bea59cc..661e53f74 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go +++ b/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go @@ -5,9 +5,9 @@ package getPowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go index 0ef820b4a..74feecf9f 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go +++ b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go @@ -1,11 +1,12 @@ package getPowerRobotSweepStrategyList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerRobotSweepStrategyList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go index 923903751..2ee7907be 100644 --- a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go +++ b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go @@ -5,9 +5,9 @@ package getPowerRobotSweepStrategyList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerSettingCharges/data.go b/iSolarCloud/AppService/getPowerSettingCharges/data.go index ad89a340f..48c6d722f 100644 --- a/iSolarCloud/AppService/getPowerSettingCharges/data.go +++ b/iSolarCloud/AppService/getPowerSettingCharges/data.go @@ -1,11 +1,12 @@ package getPowerSettingCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerSettingCharges" @@ -24,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { CurrencyTypeList []struct { CodeName valueTypes.String `json:"code_name"` CodeValue valueTypes.String `json:"code_value"` diff --git a/iSolarCloud/AppService/getPowerSettingCharges/struct.go b/iSolarCloud/AppService/getPowerSettingCharges/struct.go index 1a06aafa6..e42645eed 100644 --- a/iSolarCloud/AppService/getPowerSettingCharges/struct.go +++ b/iSolarCloud/AppService/getPowerSettingCharges/struct.go @@ -5,16 +5,16 @@ package getPowerSettingCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go b/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go index 614452a41..eb4c778f7 100644 --- a/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go +++ b/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go @@ -1,10 +1,11 @@ package getPowerSettingHistoryRecords import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go b/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go index 3dc4407e3..478d7a7fc 100644 --- a/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go +++ b/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go @@ -5,9 +5,9 @@ package getPowerSettingHistoryRecords import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go index 1627b55fc..65c1d2f9a 100644 --- a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go +++ b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go @@ -1,10 +1,11 @@ package getPowerStationBasicInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go b/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go index 34a9f5eb0..a91a465b5 100644 --- a/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go +++ b/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go @@ -5,9 +5,9 @@ package getPowerStationBasicInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationData/data.go b/iSolarCloud/AppService/getPowerStationData/data.go index 18cd3409a..931cb7c6d 100644 --- a/iSolarCloud/AppService/getPowerStationData/data.go +++ b/iSolarCloud/AppService/getPowerStationData/data.go @@ -1,11 +1,12 @@ package getPowerStationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" "time" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPowerStationData" @@ -13,9 +14,9 @@ const Disabled = false const EndPointName = "AppService.getPowerStationData" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` DateId valueTypes.DateTime `json:"date_id" required:"true"` - DateType valueTypes.String `json:"date_type" required:"true"` + DateType valueTypes.String `json:"date_type" required:"true"` } func (rd RequestData) IsValid() error { @@ -30,23 +31,23 @@ func (rd RequestData) Help() string { } type ResultData struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` DayPowerQuantityTotal valueTypes.UnitValue `json:"day_power_quantity_total" PointUpdateFreq:"UpdateFreqTotal"` DayTotalProfit valueTypes.UnitValue `json:"day_total_profit" PointUpdateFreq:"UpdateFreqTotal"` - P34048List []valueTypes.Float `json:"p34048List" PointId:"p34048" PointUnitFrom:"P34048Unit" PointVirtual:"true"` - P34048Unit valueTypes.String `json:"p34048_unit" PointIgnore:"true"` - P83012List []valueTypes.Float `json:"p83012List" PointId:"p83012" PointUnitFrom:"P83012Unit" PointVirtual:"true"` - P83012Unit valueTypes.String `json:"p83012_unit" PointIgnore:"true"` - P83033List []valueTypes.Float `json:"p83033List" PointId:"p83033" PointUnitFrom:"P83033Unit" PointVirtual:"true"` - P83033Unit valueTypes.String `json:"p83033_unit" PointIgnore:"true"` - P83106List []valueTypes.Float `json:"p83106List" PointId:"p83106" PointUnitFrom:"P83106Unit" PointVirtual:"true"` - P83106Unit valueTypes.String `json:"p83106_unit" PointIgnore:"true"` - P83022List []valueTypes.Float `json:"p83022List" PointId:"p83022" PointUnitFrom:"P83022Unit" PointVirtual:"true"` // Used for Year, Month, Day - P83022Unit valueTypes.String `json:"p83022_unit" PointIgnore:"true"` // Used for Year, Month, Day - P83118List []valueTypes.Float `json:"p83118List" PointId:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true"` // Used for Year, Month, Day - P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` // Used for Year, Month, Day + P34048List []valueTypes.Float `json:"p34048List" PointId:"p34048" PointUnitFrom:"P34048Unit" PointVirtual:"true"` + P34048Unit valueTypes.String `json:"p34048_unit" PointIgnore:"true"` + P83012List []valueTypes.Float `json:"p83012List" PointId:"p83012" PointUnitFrom:"P83012Unit" PointVirtual:"true"` + P83012Unit valueTypes.String `json:"p83012_unit" PointIgnore:"true"` + P83033List []valueTypes.Float `json:"p83033List" PointId:"p83033" PointUnitFrom:"P83033Unit" PointVirtual:"true"` + P83033Unit valueTypes.String `json:"p83033_unit" PointIgnore:"true"` + P83106List []valueTypes.Float `json:"p83106List" PointId:"p83106" PointUnitFrom:"P83106Unit" PointVirtual:"true"` + P83106Unit valueTypes.String `json:"p83106_unit" PointIgnore:"true"` + P83022List []valueTypes.Float `json:"p83022List" PointId:"p83022" PointUnitFrom:"P83022Unit" PointVirtual:"true"` // Used for Year, Month, Day + P83022Unit valueTypes.String `json:"p83022_unit" PointIgnore:"true"` // Used for Year, Month, Day + P83118List []valueTypes.Float `json:"p83118List" PointId:"p83118" PointUnitFrom:"P83118Unit" PointVirtual:"true"` // Used for Year, Month, Day + P83118Unit valueTypes.String `json:"p83118_unit" PointIgnore:"true"` // Used for Year, Month, Day } func (e *ResultData) IsValid() error { @@ -71,27 +72,27 @@ func (e *EndPoint) GetData() api.DataMap { var r []string var t string switch { - case e.Request.DateType.Match(valueTypes.DateTypeDay): - count := len(e.Response.ResultData.P34048List) - dur := time.Duration((float64(time.Hour) * 24) / float64(count)) - r = e.Request.DateId.GetRanges(count, dur, valueTypes.DateTimeLayout) - t = "Hour" - - case e.Request.DateType.Match(valueTypes.DateTypeMonth): - count := len(e.Response.ResultData.P83022List) - r = e.Request.DateId.GetRanges(count, time.Hour * 24, valueTypes.DateLayout) - t = "Day" - - case e.Request.DateType.Match(valueTypes.DateTypeYear): - count := len(e.Response.ResultData.P83022List) - r = e.Request.DateId.GetRanges(count, time.Hour * 24 * 31, "2006-01") - t = "Month" - - case e.Request.DateType.Match(valueTypes.DateTypeTotal): - // Not support for getPowerStationData. - // count := len(e.Response.ResultData.P83022List) - // r = e.Request.DateId.GetRanges(count, time.Hour * 24, valueTypes.DateLayout) - // t = "Year" + case e.Request.DateType.Match(valueTypes.DateTypeDay): + count := len(e.Response.ResultData.P34048List) + dur := time.Duration((float64(time.Hour) * 24) / float64(count)) + r = e.Request.DateId.GetRanges(count, dur, valueTypes.DateTimeLayout) + t = "Hour" + + case e.Request.DateType.Match(valueTypes.DateTypeMonth): + count := len(e.Response.ResultData.P83022List) + r = e.Request.DateId.GetRanges(count, time.Hour*24, valueTypes.DateLayout) + t = "Day" + + case e.Request.DateType.Match(valueTypes.DateTypeYear): + count := len(e.Response.ResultData.P83022List) + r = e.Request.DateId.GetRanges(count, time.Hour*24*31, "2006-01") + t = "Month" + + case e.Request.DateType.Match(valueTypes.DateTypeTotal): + // Not support for getPowerStationData. + // count := len(e.Response.ResultData.P83022List) + // r = e.Request.DateId.GetRanges(count, time.Hour * 24, valueTypes.DateLayout) + // t = "Year" } me.SetDataTableIndexNames(r...) me.SetDataTableIndexTitle(t) diff --git a/iSolarCloud/AppService/getPowerStationData/struct.go b/iSolarCloud/AppService/getPowerStationData/struct.go index 34efcfcac..eb7f40bc9 100644 --- a/iSolarCloud/AppService/getPowerStationData/struct.go +++ b/iSolarCloud/AppService/getPowerStationData/struct.go @@ -5,9 +5,9 @@ package getPowerStationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationForHousehold/data.go b/iSolarCloud/AppService/getPowerStationForHousehold/data.go index a08ac9e41..9a728359e 100644 --- a/iSolarCloud/AppService/getPowerStationForHousehold/data.go +++ b/iSolarCloud/AppService/getPowerStationForHousehold/data.go @@ -1,11 +1,12 @@ package getPowerStationForHousehold import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPowerStationForHousehold/struct.go b/iSolarCloud/AppService/getPowerStationForHousehold/struct.go index 92f559a7d..41c5440ed 100644 --- a/iSolarCloud/AppService/getPowerStationForHousehold/struct.go +++ b/iSolarCloud/AppService/getPowerStationForHousehold/struct.go @@ -5,9 +5,9 @@ package getPowerStationForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationInfo/data.go b/iSolarCloud/AppService/getPowerStationInfo/data.go index 521fac697..292554ea3 100644 --- a/iSolarCloud/AppService/getPowerStationInfo/data.go +++ b/iSolarCloud/AppService/getPowerStationInfo/data.go @@ -1,11 +1,12 @@ package getPowerStationInfo import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPowerStationInfo/struct.go b/iSolarCloud/AppService/getPowerStationInfo/struct.go index 828564c00..bd0349420 100644 --- a/iSolarCloud/AppService/getPowerStationInfo/struct.go +++ b/iSolarCloud/AppService/getPowerStationInfo/struct.go @@ -5,9 +5,9 @@ package getPowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationPR/data.go b/iSolarCloud/AppService/getPowerStationPR/data.go index c213d26fd..4be3de0f5 100644 --- a/iSolarCloud/AppService/getPowerStationPR/data.go +++ b/iSolarCloud/AppService/getPowerStationPR/data.go @@ -1,11 +1,12 @@ package getPowerStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerStationPR" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerStationPR/struct.go b/iSolarCloud/AppService/getPowerStationPR/struct.go index afc4ff816..539a39da6 100644 --- a/iSolarCloud/AppService/getPowerStationPR/struct.go +++ b/iSolarCloud/AppService/getPowerStationPR/struct.go @@ -5,9 +5,9 @@ package getPowerStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationTableDataSql/data.go b/iSolarCloud/AppService/getPowerStationTableDataSql/data.go index acbdb6c22..f5d1a8268 100644 --- a/iSolarCloud/AppService/getPowerStationTableDataSql/data.go +++ b/iSolarCloud/AppService/getPowerStationTableDataSql/data.go @@ -1,11 +1,12 @@ package getPowerStationTableDataSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerStationTableDataSql" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go b/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go index 4161cf8e5..51619290a 100644 --- a/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go +++ b/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go @@ -5,9 +5,9 @@ package getPowerStationTableDataSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go index a33e09d24..ba1b161a6 100644 --- a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go +++ b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go @@ -1,11 +1,12 @@ package getPowerStationTableDataSqlCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerStationTableDataSqlCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go index 51b66376f..803bfdcc9 100644 --- a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go +++ b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go @@ -5,9 +5,9 @@ package getPowerStationTableDataSqlCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerStatistics/data.go b/iSolarCloud/AppService/getPowerStatistics/data.go index 0382c6aea..ad37df598 100644 --- a/iSolarCloud/AppService/getPowerStatistics/data.go +++ b/iSolarCloud/AppService/getPowerStatistics/data.go @@ -1,10 +1,11 @@ package getPowerStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,12 +27,12 @@ func (rd RequestData) Help() string { } type ResultData struct { - City valueTypes.String `json:"city"` - PsName valueTypes.String `json:"ps_name"` - PsShortName valueTypes.String `json:"ps_short_name"` - Status1 valueTypes.Integer `json:"status1"` - Status2 valueTypes.Integer `json:"status2"` - Status3 valueTypes.Integer `json:"status3"` + City valueTypes.String `json:"city"` + PsName valueTypes.String `json:"ps_name"` + PsShortName valueTypes.String `json:"ps_short_name"` + Status1 valueTypes.Integer `json:"status1"` + Status2 valueTypes.Integer `json:"status2"` + Status3 valueTypes.Integer `json:"status3"` DayPower valueTypes.UnitValue `json:"dayPower" PointId:"day_power"` DesignCapacity valueTypes.UnitValue `json:"design_capacity"` diff --git a/iSolarCloud/AppService/getPowerStatistics/struct.go b/iSolarCloud/AppService/getPowerStatistics/struct.go index b1a8d0bb6..cdd91ea36 100644 --- a/iSolarCloud/AppService/getPowerStatistics/struct.go +++ b/iSolarCloud/AppService/getPowerStatistics/struct.go @@ -5,16 +5,16 @@ package getPowerStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPowerTrendDayData/data.go b/iSolarCloud/AppService/getPowerTrendDayData/data.go index 766161668..e4d8136e7 100644 --- a/iSolarCloud/AppService/getPowerTrendDayData/data.go +++ b/iSolarCloud/AppService/getPowerTrendDayData/data.go @@ -1,11 +1,12 @@ package getPowerTrendDayData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -27,7 +28,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPowerTrendDayData/struct.go b/iSolarCloud/AppService/getPowerTrendDayData/struct.go index e826b0543..2cb838071 100644 --- a/iSolarCloud/AppService/getPowerTrendDayData/struct.go +++ b/iSolarCloud/AppService/getPowerTrendDayData/struct.go @@ -5,9 +5,9 @@ package getPowerTrendDayData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go index e28181b4d..b35d7277c 100644 --- a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go +++ b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go @@ -1,11 +1,12 @@ package getPrivateCloudValidityPeriod import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getPrivateCloudValidityPeriod" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go index 9f5f82735..c60b75aaf 100644 --- a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go +++ b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go @@ -5,9 +5,9 @@ package getPrivateCloudValidityPeriod import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getProvInfoListByNationCode/data.go b/iSolarCloud/AppService/getProvInfoListByNationCode/data.go index efec5eb17..a7389c1f1 100644 --- a/iSolarCloud/AppService/getProvInfoListByNationCode/data.go +++ b/iSolarCloud/AppService/getProvInfoListByNationCode/data.go @@ -1,11 +1,12 @@ package getProvInfoListByNationCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getProvInfoListByNationCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go b/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go index bf2f91af4..7060e3485 100644 --- a/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go +++ b/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go @@ -5,9 +5,9 @@ package getProvInfoListByNationCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsAuthKey/data.go b/iSolarCloud/AppService/getPsAuthKey/data.go index 080b40a00..c47b60afd 100644 --- a/iSolarCloud/AppService/getPsAuthKey/data.go +++ b/iSolarCloud/AppService/getPsAuthKey/data.go @@ -1,11 +1,12 @@ package getPsAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsAuthKey" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPsAuthKey/struct.go b/iSolarCloud/AppService/getPsAuthKey/struct.go index 32a063d29..48609da20 100644 --- a/iSolarCloud/AppService/getPsAuthKey/struct.go +++ b/iSolarCloud/AppService/getPsAuthKey/struct.go @@ -5,9 +5,9 @@ package getPsAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsCurveInfo/data.go b/iSolarCloud/AppService/getPsCurveInfo/data.go index 9bcfb1a9f..30e2365e2 100644 --- a/iSolarCloud/AppService/getPsCurveInfo/data.go +++ b/iSolarCloud/AppService/getPsCurveInfo/data.go @@ -1,11 +1,12 @@ package getPsCurveInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsCurveInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getPsCurveInfo/struct.go b/iSolarCloud/AppService/getPsCurveInfo/struct.go index 600d0f09f..a976630e5 100644 --- a/iSolarCloud/AppService/getPsCurveInfo/struct.go +++ b/iSolarCloud/AppService/getPsCurveInfo/struct.go @@ -5,9 +5,9 @@ package getPsCurveInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go b/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go index dd3e454d4..a4850a966 100644 --- a/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go +++ b/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go @@ -1,10 +1,11 @@ package getPsDataSupplementTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsDataSupplementTaskList" diff --git a/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go b/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go index e415cbea0..795d83689 100644 --- a/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go +++ b/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go @@ -5,9 +5,9 @@ package getPsDataSupplementTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsDetail/data.go b/iSolarCloud/AppService/getPsDetail/data.go index d27e6cc9e..fc0bc2900 100644 --- a/iSolarCloud/AppService/getPsDetail/data.go +++ b/iSolarCloud/AppService/getPsDetail/data.go @@ -1,11 +1,12 @@ package getPsDetail import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsDetail" @@ -26,8 +27,8 @@ func (rd RequestData) Help() string { } type ResultData struct { - 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"` + PlanEnergy []valueTypes.Float `json:"plan_energy" PointUnitFrom:"PlanEnergyUnit" PointArrayFlatten:"true"` BuildDate valueTypes.DateTime `json:"build_date" PointNameDateFormat:"DateTimeLayout"` DataLastUpdateTime valueTypes.DateTime `json:"data_last_update_time" PointNameDateFormat:"DateTimeLayout"` @@ -128,87 +129,87 @@ type ResultData struct { Year valueTypes.Integer `json:"year"` ZipCode valueTypes.String `json:"zip_code"` - P83012Value valueTypes.Float `json:"p83012_value" PointId:"p83012" PointUnitFrom:"P83012Unit" PointVirtual:"true"` - P83012Unit valueTypes.String `json:"p83012_unit" PointId:"p83012_unit" PointIgnore:"true"` - P83013Value valueTypes.Float `json:"p83013_value" PointId:"p83013" PointUnitFrom:"P83013Unit" PointVirtual:"true"` - P83013Unit valueTypes.String `json:"p83013_unit" PointId:"p83013_unit" PointIgnore:"true"` - P83036Value valueTypes.Float `json:"p83036_value" PointId:"p83036" PointUnitFrom:"P83036Unit" PointVirtual:"true"` - P83036Unit valueTypes.String `json:"p83036_unit" PointId:"p83036_unit" PointIgnore:"true"` - P83016 valueTypes.Float `json:"p83016" PointId:"p83016" PointUnitFrom:"P83016Unit" PointVirtual:"true"` - P83016Unit valueTypes.String `json:"p83016_unit" PointId:"p83016_unit" PointIgnore:"true"` - P83017 valueTypes.Float `json:"p83017" PointId:"p83017" PointUnitFrom:"P83017Unit" PointVirtual:"true"` - P83017Unit valueTypes.String `json:"p83017_unit" PointId:"p83017_unit" PointIgnore:"true"` - P83023 valueTypes.Float `json:"p83023" PointId:"p83023" PointVirtual:"true"` - P83023y valueTypes.String `json:"p83023y" PointId:"p83023y" PointVirtual:"true"` - P83023year valueTypes.String `json:"p83023year" PointId:"p83023y" PointVirtual:"true"` - P83023ym valueTypes.String `json:"p83023ym" PointId:"p83023ym" PointVirtual:"true"` - P83043 valueTypes.Float `json:"p83043" PointId:"p83043" PointVirtual:"true"` - P83044 valueTypes.Float `json:"p83044" PointId:"p83044" PointVirtual:"true"` - P83045 valueTypes.Float `json:"p83045" PointId:"p83045" PointVirtual:"true"` - P83072Map valueTypes.UnitValue `json:"p83072_map" PointId:"p83072" PointVirtual:"true"` - P83072MapVirgin valueTypes.UnitValue `json:"p83072_map_virgin" PointIgnore:"true"` - P83073Map valueTypes.UnitValue `json:"p83073_map" PointId:"p83073" PointVirtual:"true"` - P83073MapVirgin valueTypes.UnitValue `json:"p83073_map_virgin" PointIgnore:"true"` - P83074Map valueTypes.UnitValue `json:"p83074_map" PointId:"p83074" PointVirtual:"true"` - P83074MapVirgin valueTypes.UnitValue `json:"p83074_map_virgin" PointIgnore:"true"` - P83075Map valueTypes.UnitValue `json:"p83075_map" PointId:"p83075" PointVirtual:"true"` - P83075MapVirgin valueTypes.UnitValue `json:"p83075_map_virgin" PointIgnore:"true"` - P83076Map valueTypes.UnitValue `json:"p83076_map" PointName:"Pv Power" PointId:"p83076" PointVirtual:"true"` - P83076MapVirgin valueTypes.UnitValue `json:"p83076_map_virgin" PointIgnore:"true"` - P83077Map valueTypes.UnitValue `json:"p83077_map" PointName:"Pv Energy" PointId:"p83077" PointVirtual:"true"` - P83077MapVirgin valueTypes.UnitValue `json:"p83077_map_virgin" PointIgnore:"true"` - P83078Map valueTypes.UnitValue `json:"p83078_map" PointId:"p83078" PointVirtual:"true"` - P83078MapVirgin valueTypes.UnitValue `json:"p83078_map_virgin" PointIgnore:"true"` - P83079Map valueTypes.UnitValue `json:"p83079_map" PointId:"p83079" PointVirtual:"true"` - P83079MapVirgin valueTypes.UnitValue `json:"p83079_map_virgin" PointIgnore:"true"` - P83080Map valueTypes.UnitValue `json:"p83080_map" PointId:"p83080" PointVirtual:"true"` - P83080MapVirgin valueTypes.UnitValue `json:"p83080_map_virgin" PointIgnore:"true"` - P83088Map valueTypes.UnitValue `json:"p83088_map" PointName:"ES Energy" PointId:"p83088" PointVirtual:"true"` - P83088MapVirgin valueTypes.UnitValue `json:"p83088_map_virgin" PointIgnore:"true"` - P83089Map valueTypes.UnitValue `json:"p83089_map" PointName:"ES Discharge Energy" PointId:"p83089" PointVirtual:"true"` - P83089MapVirgin valueTypes.UnitValue `json:"p83089_map_virgin" PointIgnore:"true"` - P83094Map valueTypes.UnitValue `json:"p83094_map" PointId:"p83094" PointVirtual:"true"` - P83094MapVirgin valueTypes.UnitValue `json:"p83094_map_virgin" PointIgnore:"true"` - P83095Map valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointName:"ES Total Discharge Energy" PointUpdateFreq:"UpdateFreqTotal" PointVirtual:"true"` - P83095MapVirgin valueTypes.UnitValue `json:"p83095_map_virgin" PointIgnore:"true"` - P83097Map valueTypes.UnitValue `json:"p83097_map" PointId:"p83097" PointVirtual:"true"` - P83097MapVirgin valueTypes.UnitValue `json:"p83097_map_virgin" PointIgnore:"true"` - P83100Map valueTypes.UnitValue `json:"p83100_map" PointId:"p83100" PointVirtual:"true"` - P83100MapVirgin valueTypes.UnitValue `json:"p83100_map_virgin" PointIgnore:"true"` - P83101Map valueTypes.UnitValue `json:"p83101_map" PointId:"p83101" PointVirtual:"true"` - P83101MapVirgin valueTypes.UnitValue `json:"p83101_map_virgin" PointIgnore:"true"` - P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102" PointName:"Energy Purchased" PointVirtual:"true"` - P83102MapVirgin valueTypes.UnitValue `json:"p83102_map_virgin" PointIgnore:"true"` - P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102_percent" PointName:"Energy Purchased Percent" PointUnit:"%" PointVirtual:"true"` - P83105Map valueTypes.UnitValue `json:"p83105_map" PointId:"p83105" PointVirtual:"true"` - P83105MapVirgin valueTypes.UnitValue `json:"p83105_map_virgin" PointIgnore:"true"` - P83106Map valueTypes.UnitValue `json:"p83106_map" PointId:"p83106" PointVirtual:"true"` - P83106MapVirgin valueTypes.UnitValue `json:"p83106_map_virgin" PointIgnore:"true"` - P83107Map valueTypes.UnitValue `json:"p83107_map" PointId:"p83107" PointVirtual:"true"` - P83107MapVirgin valueTypes.UnitValue `json:"p83107_map_virgin" PointIgnore:"true"` - P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointName:"Energy Used" PointVirtual:"true"` - P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` - P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointName:"Energy Feed-In" PointVirtual:"true"` - P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` - P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointName:"Energy Battery Charge" PointVirtual:"true"` - P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` - P83121 valueTypes.Float `json:"p83121" PointId:"p83121" PointVirtual:"true"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83123Map valueTypes.UnitValue `json:"p83123_map" PointId:"p83123" PointVirtual:"true"` - P83123MapVirgin valueTypes.UnitValue `json:"p83123_map_virgin" PointIgnore:"true"` - P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true"` - P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` - P83125 valueTypes.Float `json:"p83125" PointId:"p83125" PointVirtual:"true"` - P83126 valueTypes.Float `json:"p83126" PointId:"p83126" PointVirtual:"true"` - P83128MapVirgin valueTypes.UnitValue `json:"p83128_map_virgin" PointIgnore:"true"` - P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202" PointName:"Installed Power" PointVirtual:"true"` - P83202MapVirgin valueTypes.UnitValue `json:"p83202_map_virgin" PointIgnore:"true"` - ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointName:"Self Consumption Of PV" PointVirtual:"true"` - ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` - ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointName:"Self Sufficiency" PointVirtual:"true"` - ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` + P83012Value valueTypes.Float `json:"p83012_value" PointId:"p83012" PointUnitFrom:"P83012Unit" PointVirtual:"true"` + P83012Unit valueTypes.String `json:"p83012_unit" PointId:"p83012_unit" PointIgnore:"true"` + P83013Value valueTypes.Float `json:"p83013_value" PointId:"p83013" PointUnitFrom:"P83013Unit" PointVirtual:"true"` + P83013Unit valueTypes.String `json:"p83013_unit" PointId:"p83013_unit" PointIgnore:"true"` + P83036Value valueTypes.Float `json:"p83036_value" PointId:"p83036" PointUnitFrom:"P83036Unit" PointVirtual:"true"` + P83036Unit valueTypes.String `json:"p83036_unit" PointId:"p83036_unit" PointIgnore:"true"` + P83016 valueTypes.Float `json:"p83016" PointId:"p83016" PointUnitFrom:"P83016Unit" PointVirtual:"true"` + P83016Unit valueTypes.String `json:"p83016_unit" PointId:"p83016_unit" PointIgnore:"true"` + P83017 valueTypes.Float `json:"p83017" PointId:"p83017" PointUnitFrom:"P83017Unit" PointVirtual:"true"` + P83017Unit valueTypes.String `json:"p83017_unit" PointId:"p83017_unit" PointIgnore:"true"` + P83023 valueTypes.Float `json:"p83023" PointId:"p83023" PointVirtual:"true"` + P83023y valueTypes.String `json:"p83023y" PointId:"p83023y" PointVirtual:"true"` + P83023year valueTypes.String `json:"p83023year" PointId:"p83023y" PointVirtual:"true"` + P83023ym valueTypes.String `json:"p83023ym" PointId:"p83023ym" PointVirtual:"true"` + P83043 valueTypes.Float `json:"p83043" PointId:"p83043" PointVirtual:"true"` + P83044 valueTypes.Float `json:"p83044" PointId:"p83044" PointVirtual:"true"` + P83045 valueTypes.Float `json:"p83045" PointId:"p83045" PointVirtual:"true"` + P83072Map valueTypes.UnitValue `json:"p83072_map" PointId:"p83072" PointVirtual:"true"` + P83072MapVirgin valueTypes.UnitValue `json:"p83072_map_virgin" PointIgnore:"true"` + P83073Map valueTypes.UnitValue `json:"p83073_map" PointId:"p83073" PointVirtual:"true"` + P83073MapVirgin valueTypes.UnitValue `json:"p83073_map_virgin" PointIgnore:"true"` + P83074Map valueTypes.UnitValue `json:"p83074_map" PointId:"p83074" PointVirtual:"true"` + P83074MapVirgin valueTypes.UnitValue `json:"p83074_map_virgin" PointIgnore:"true"` + P83075Map valueTypes.UnitValue `json:"p83075_map" PointId:"p83075" PointVirtual:"true"` + P83075MapVirgin valueTypes.UnitValue `json:"p83075_map_virgin" PointIgnore:"true"` + P83076Map valueTypes.UnitValue `json:"p83076_map" PointName:"Pv Power" PointId:"p83076" PointVirtual:"true"` + P83076MapVirgin valueTypes.UnitValue `json:"p83076_map_virgin" PointIgnore:"true"` + P83077Map valueTypes.UnitValue `json:"p83077_map" PointName:"Pv Energy" PointId:"p83077" PointVirtual:"true"` + P83077MapVirgin valueTypes.UnitValue `json:"p83077_map_virgin" PointIgnore:"true"` + P83078Map valueTypes.UnitValue `json:"p83078_map" PointId:"p83078" PointVirtual:"true"` + P83078MapVirgin valueTypes.UnitValue `json:"p83078_map_virgin" PointIgnore:"true"` + P83079Map valueTypes.UnitValue `json:"p83079_map" PointId:"p83079" PointVirtual:"true"` + P83079MapVirgin valueTypes.UnitValue `json:"p83079_map_virgin" PointIgnore:"true"` + P83080Map valueTypes.UnitValue `json:"p83080_map" PointId:"p83080" PointVirtual:"true"` + P83080MapVirgin valueTypes.UnitValue `json:"p83080_map_virgin" PointIgnore:"true"` + P83088Map valueTypes.UnitValue `json:"p83088_map" PointName:"ES Energy" PointId:"p83088" PointVirtual:"true"` + P83088MapVirgin valueTypes.UnitValue `json:"p83088_map_virgin" PointIgnore:"true"` + P83089Map valueTypes.UnitValue `json:"p83089_map" PointName:"ES Discharge Energy" PointId:"p83089" PointVirtual:"true"` + P83089MapVirgin valueTypes.UnitValue `json:"p83089_map_virgin" PointIgnore:"true"` + P83094Map valueTypes.UnitValue `json:"p83094_map" PointId:"p83094" PointVirtual:"true"` + P83094MapVirgin valueTypes.UnitValue `json:"p83094_map_virgin" PointIgnore:"true"` + P83095Map valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointName:"ES Total Discharge Energy" PointUpdateFreq:"UpdateFreqTotal" PointVirtual:"true"` + P83095MapVirgin valueTypes.UnitValue `json:"p83095_map_virgin" PointIgnore:"true"` + P83097Map valueTypes.UnitValue `json:"p83097_map" PointId:"p83097" PointVirtual:"true"` + P83097MapVirgin valueTypes.UnitValue `json:"p83097_map_virgin" PointIgnore:"true"` + P83100Map valueTypes.UnitValue `json:"p83100_map" PointId:"p83100" PointVirtual:"true"` + P83100MapVirgin valueTypes.UnitValue `json:"p83100_map_virgin" PointIgnore:"true"` + P83101Map valueTypes.UnitValue `json:"p83101_map" PointId:"p83101" PointVirtual:"true"` + P83101MapVirgin valueTypes.UnitValue `json:"p83101_map_virgin" PointIgnore:"true"` + P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102" PointName:"Energy Purchased" PointVirtual:"true"` + P83102MapVirgin valueTypes.UnitValue `json:"p83102_map_virgin" PointIgnore:"true"` + P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102_percent" PointName:"Energy Purchased Percent" PointUnit:"%" PointVirtual:"true"` + P83105Map valueTypes.UnitValue `json:"p83105_map" PointId:"p83105" PointVirtual:"true"` + P83105MapVirgin valueTypes.UnitValue `json:"p83105_map_virgin" PointIgnore:"true"` + P83106Map valueTypes.UnitValue `json:"p83106_map" PointId:"p83106" PointVirtual:"true"` + P83106MapVirgin valueTypes.UnitValue `json:"p83106_map_virgin" PointIgnore:"true"` + P83107Map valueTypes.UnitValue `json:"p83107_map" PointId:"p83107" PointVirtual:"true"` + P83107MapVirgin valueTypes.UnitValue `json:"p83107_map_virgin" PointIgnore:"true"` + P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointName:"Energy Used" PointVirtual:"true"` + P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` + P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointName:"Energy Feed-In" PointVirtual:"true"` + P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` + P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointName:"Energy Battery Charge" PointVirtual:"true"` + P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` + P83121 valueTypes.Float `json:"p83121" PointId:"p83121" PointVirtual:"true"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83123Map valueTypes.UnitValue `json:"p83123_map" PointId:"p83123" PointVirtual:"true"` + P83123MapVirgin valueTypes.UnitValue `json:"p83123_map_virgin" PointIgnore:"true"` + P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true"` + P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` + P83125 valueTypes.Float `json:"p83125" PointId:"p83125" PointVirtual:"true"` + P83126 valueTypes.Float `json:"p83126" PointId:"p83126" PointVirtual:"true"` + P83128MapVirgin valueTypes.UnitValue `json:"p83128_map_virgin" PointIgnore:"true"` + P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202" PointName:"Installed Power" PointVirtual:"true"` + P83202MapVirgin valueTypes.UnitValue `json:"p83202_map_virgin" PointIgnore:"true"` + ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointName:"Self Consumption Of PV" PointVirtual:"true"` + ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` + ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointName:"Self Sufficiency" PointVirtual:"true"` + ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` - Images Common.PowerStationImages `json:"images"` + Images Common.PowerStationImages `json:"images"` RobotNumSweepCapacity struct { Num valueTypes.Integer `json:"num"` @@ -216,7 +217,7 @@ type ResultData struct { } `json:"robot_num_sweep_capacity"` StorageInverterData []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"PsKey" PointDeviceFrom:"PsKey"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"PsKey" PointDeviceFrom:"PsKey"` UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` PsKey valueTypes.PsKey `json:"ps_key"` @@ -237,25 +238,25 @@ type ResultData struct { UUID valueTypes.Integer `json:"uuid"` EnergyFlow []valueTypes.Integer `json:"energy_flow" PointName:"Energy Flow" PointIgnoreZero:"false" PointArrayFlatten:"true"` - P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointName:"PV Power To Load" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13003MapVirgin valueTypes.UnitValue `json:"p13003_map_virgin" PointIgnore:"true"` - P13011Map valueTypes.UnitValue `json:"p13011_map" PointId:"p13011" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13011MapVirgin valueTypes.UnitValue `json:"p13011_map_virgin" PointIgnore:"true"` - P13115Map valueTypes.UnitValue `json:"p13115_map" PointId:"p13115" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13115MapVirgin valueTypes.UnitValue `json:"p13115_map_virgin" PointIgnore:"true"` - P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointName:"Load Power" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13119MapVirgin valueTypes.UnitValue `json:"p13119_map_virgin" PointIgnore:"true"` - P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointName:"PV Power To Grid" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13121MapVirgin valueTypes.UnitValue `json:"p13121_map_virgin" PointIgnore:"true"` - P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointName:"PV Power To Battery" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13126MapVirgin valueTypes.UnitValue `json:"p13126_map_virgin" PointIgnore:"true"` - P13141 valueTypes.Float `json:"p13141" PointName:"Battery Charge Percent" PointUnit:"%" PointIcon:"mdi:battery" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13142 valueTypes.Float `json:"p13142" PointName:"Battery Health" PointUnit:"%" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointName:"Grid Power To Load" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13149MapVirgin valueTypes.UnitValue `json:"p13149_map_virgin" PointIgnore:"true"` - P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` - P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"` - P13155 valueTypes.Float `json:"p13155" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointName:"PV Power To Load" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13003MapVirgin valueTypes.UnitValue `json:"p13003_map_virgin" PointIgnore:"true"` + P13011Map valueTypes.UnitValue `json:"p13011_map" PointId:"p13011" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13011MapVirgin valueTypes.UnitValue `json:"p13011_map_virgin" PointIgnore:"true"` + P13115Map valueTypes.UnitValue `json:"p13115_map" PointId:"p13115" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13115MapVirgin valueTypes.UnitValue `json:"p13115_map_virgin" PointIgnore:"true"` + P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointName:"Load Power" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13119MapVirgin valueTypes.UnitValue `json:"p13119_map_virgin" PointIgnore:"true"` + P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointName:"PV Power To Grid" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13121MapVirgin valueTypes.UnitValue `json:"p13121_map_virgin" PointIgnore:"true"` + P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointName:"PV Power To Battery" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13126MapVirgin valueTypes.UnitValue `json:"p13126_map_virgin" PointIgnore:"true"` + P13141 valueTypes.Float `json:"p13141" PointName:"Battery Charge Percent" PointUnit:"%" PointIcon:"mdi:battery" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13142 valueTypes.Float `json:"p13142" PointName:"Battery Health" PointUnit:"%" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointName:"Grid Power To Load" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13149MapVirgin valueTypes.UnitValue `json:"p13149_map_virgin" PointIgnore:"true"` + P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` + P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"` + P13155 valueTypes.Float `json:"p13155" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true" PointVirtualShift:"3"` } `json:"storage_inverter_data" DataTable:"false"` } diff --git a/iSolarCloud/AppService/getPsDetail/struct.go b/iSolarCloud/AppService/getPsDetail/struct.go index a2c3b4984..e02689410 100644 --- a/iSolarCloud/AppService/getPsDetail/struct.go +++ b/iSolarCloud/AppService/getPsDetail/struct.go @@ -5,9 +5,9 @@ package getPsDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsDetailByUserTokens/data.go b/iSolarCloud/AppService/getPsDetailByUserTokens/data.go index 2bd2c7382..2cc167b82 100644 --- a/iSolarCloud/AppService/getPsDetailByUserTokens/data.go +++ b/iSolarCloud/AppService/getPsDetailByUserTokens/data.go @@ -1,8 +1,8 @@ package getPsDetailByUserTokens import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go b/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go index c5618e4f1..73a078769 100644 --- a/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go +++ b/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go @@ -5,9 +5,9 @@ package getPsDetailByUserTokens import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsDetailForSinglePage/data.go b/iSolarCloud/AppService/getPsDetailForSinglePage/data.go index 70611e386..83d43ce63 100644 --- a/iSolarCloud/AppService/getPsDetailForSinglePage/data.go +++ b/iSolarCloud/AppService/getPsDetailForSinglePage/data.go @@ -1,10 +1,11 @@ package getPsDetailForSinglePage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -74,7 +75,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go b/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go index 324f87216..c68a19e37 100644 --- a/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go +++ b/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go @@ -5,9 +5,9 @@ package getPsDetailForSinglePage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsDetailWithPsType/data.go b/iSolarCloud/AppService/getPsDetailWithPsType/data.go index a1f6a4cd6..70c3ba796 100644 --- a/iSolarCloud/AppService/getPsDetailWithPsType/data.go +++ b/iSolarCloud/AppService/getPsDetailWithPsType/data.go @@ -1,10 +1,11 @@ package getPsDetailWithPsType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsDetailWithPsType" @@ -28,17 +29,17 @@ type ResultData struct { // GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsKey" PointIdReplace:"true"` BatteryLevelPercent valueTypes.Float `json:"battery_level_percent" PointId:"battery_level_percent" PointUnit:"%" PointIcon:"mdi:battery" PointUpdateFreq:"UpdateFreqInstant"` - ChargingDischargingPowerMap valueTypes.UnitValue `json:"charging_discharging_power_map" PointId:"charging_discharging_power_map" PointUpdateFreq:"UpdateFreqInstant"` // Holds the battery charge/discharge amount + 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"` ConnectType valueTypes.Integer `json:"connect_type" PointId:"connect_type" PointUpdateFreq:"UpdateFreqBoot"` CurrPower valueTypes.UnitValue `json:"curr_power" PointId:"curr_power" PointUpdateFreq:"UpdateFreqInstant"` DesignCapacity valueTypes.UnitValue `json:"design_capacity" PointId:"design_capacity" PointUpdateFreq:"UpdateFreqBoot"` - EnergyScheme valueTypes.Generic `json:"energy_scheme" PointId:"energy_scheme"` + EnergyScheme valueTypes.Generic `json:"energy_scheme" PointId:"energy_scheme"` GcjLatitude valueTypes.Float `json:"gcj_latitude" PointId:"gcj_latitude" PointUpdateFreq:"UpdateFreqBoot"` GcjLongitude valueTypes.Float `json:"gcj_longitude" PointId:"gcj_longitude" PointUpdateFreq:"UpdateFreqBoot"` HasAmmeter valueTypes.Bool `json:"has_ammeter" PointId:"has_ammeter" PointUpdateFreq:"UpdateFreqBoot"` - HouseholdInverterData valueTypes.Generic `json:"household_inverter_data" PointId:"household_inverter_data"` + HouseholdInverterData valueTypes.Generic `json:"household_inverter_data" PointId:"household_inverter_data"` InstallerPsFaultStatus valueTypes.Integer `json:"installer_ps_fault_status" PointId:"installer_ps_fault_status" PointUpdateFreq:"UpdateFreqInstant"` IsHaveEsInverter valueTypes.Bool `json:"is_have_es_inverter" PointId:"is_have_es_inverter" PointUpdateFreq:"UpdateFreqBoot"` IsSingleInverter valueTypes.Bool `json:"is_single_inverter" PointId:"is_single_inverter" PointUpdateFreq:"UpdateFreqBoot"` @@ -54,30 +55,30 @@ type ResultData struct { MonthEnergy valueTypes.UnitValue `json:"month_energy" PointId:"month_energy" PointUpdateFreq:"UpdateFreqMonth"` MonthEnergyVirgin valueTypes.UnitValue `json:"month_energy_virgin" PointIgnore:"true"` MonthIncome valueTypes.UnitValue `json:"month_income" PointId:"month_income" PointUpdateFreq:"UpdateFreqMonth"` - NegativeLoadMsg valueTypes.Generic `json:"negative_load_msg" PointId:"negative_load_msg"` + NegativeLoadMsg valueTypes.Generic `json:"negative_load_msg" PointId:"negative_load_msg"` OwnerPsFaultStatus valueTypes.Integer `json:"owner_ps_fault_status" PointId:"owner_ps_fault_status" PointUpdateFreq:"UpdateFreqInstant"` - P83081Map valueTypes.UnitValue `json:"p83081_map" PointId:"p83081" PointName:"Load Power" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83081MapVirgin valueTypes.UnitValue `json:"p83081_map_virgin" PointIgnore:"true"` - P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102" PointName:"Energy Purchased" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83102MapVirgin valueTypes.UnitValue `json:"p83102_map_virgin" PointIgnore:"true"` - P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102_percent" PointName:"Energy Purchased Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointName:"Energy Used" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` - P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointName:"Energy Feed-In" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` - P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointName:"Energy Battery Charge" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` - P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` - P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202" PointName:"Installed Power" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - P83202MapVirgin valueTypes.UnitValue `json:"p83202_map_virgin" PointIgnore:"true"` - P83532MapVirgin valueTypes.UnitValue `json:"p83532_map_virgin" PointIgnore:"true"` - ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointId:"zfzy_map" PointName:"Self Consumption Of PV" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` - ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointId:"zjzz_map" PointName:"Self Sufficiency" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` - ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` + P83081Map valueTypes.UnitValue `json:"p83081_map" PointId:"p83081" PointName:"Load Power" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83081MapVirgin valueTypes.UnitValue `json:"p83081_map_virgin" PointIgnore:"true"` + P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102" PointName:"Energy Purchased" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83102MapVirgin valueTypes.UnitValue `json:"p83102_map_virgin" PointIgnore:"true"` + P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102_percent" PointName:"Energy Purchased Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointName:"Energy Used" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"` + P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointName:"Energy Feed-In" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"` + P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointName:"Energy Battery Charge" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"` + P83122 valueTypes.Float `json:"p83122" PointName:"Self Sufficiency Percent" PointUnit:"%" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"` + P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202" PointName:"Installed Power" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + P83202MapVirgin valueTypes.UnitValue `json:"p83202_map_virgin" PointIgnore:"true"` + P83532MapVirgin valueTypes.UnitValue `json:"p83532_map_virgin" PointIgnore:"true"` + ZfzyMap valueTypes.UnitValue `json:"zfzy_map" PointId:"zfzy_map" PointName:"Self Consumption Of PV" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"` + ZjzzMap valueTypes.UnitValue `json:"zjzz_map" PointId:"zjzz_map" PointName:"Self Sufficiency" PointVirtual:"true" PointUpdateFreq:"UpdateFreq5Mins"` + ZjzzMapVirgin valueTypes.UnitValue `json:"zjzz_map_virgin" PointIgnore:"true"` PowerChargeSet valueTypes.Bool `json:"power_charge_setted" PointId:"power_charge_set" PointUpdateFreq:"UpdateFreqBoot"` PowerGridPowerMap valueTypes.UnitValue `json:"power_grid_power_map" PointId:"power_grid_power_map" PointUpdateFreq:"UpdateFreq5Mins"` @@ -106,8 +107,8 @@ type ResultData struct { WgsLatitude valueTypes.Float `json:"wgs_latitude" PointId:"wgs_latitude" PointUpdateFreq:"UpdateFreqBoot"` WgsLongitude valueTypes.Float `json:"wgs_longitude" PointId:"wgs_longitude" PointUpdateFreq:"UpdateFreqBoot"` - StorageInverterData []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsKey" PointIdReplace:"true"` + StorageInverterData []struct { + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsKey" PointIdReplace:"true"` PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"` UUID valueTypes.Integer `json:"uuid" PointId:"uuid" PointUpdateFreq:"UpdateFreqBoot"` @@ -126,22 +127,22 @@ type ResultData struct { InverterSn valueTypes.String `json:"inverter_sn" PointId:"inverter_sn" PointUpdateFreq:"UpdateFreqBoot"` OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status" PointId:"owner_dev_fault_status" PointUpdateFreq:"UpdateFreqInstant"` - P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointName:"PV Power To Load" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13003MapVirgin valueTypes.UnitValue `json:"p13003_map_virgin" PointIgnore:"true"` - P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointName:"Load Power" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13119MapVirgin valueTypes.UnitValue `json:"p13119_map_virgin" PointIgnore:"true"` - P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointName:"PV Power To Grid" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13121MapVirgin valueTypes.UnitValue `json:"p13121_map_virgin" PointIgnore:"true"` - P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointName:"PV Power To Battery" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13126MapVirgin valueTypes.UnitValue `json:"p13126_map_virgin" PointIgnore:"true"` - P13141 valueTypes.Float `json:"p13141" PointId:"p13141" PointName:"Battery Charge Percent" PointIcon:"mdi:battery" PointVirtual:"true" PointVirtualShift:"3" PointUnit:"%" PointUpdateFreq:"UpdateFreq5Mins"` - P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointName:"Grid Power To Load" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13149MapVirgin valueTypes.UnitValue `json:"p13149_map_virgin" PointIgnore:"true"` - P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` - P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"` + P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointName:"PV Power To Load" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13003MapVirgin valueTypes.UnitValue `json:"p13003_map_virgin" PointIgnore:"true"` + P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointName:"Load Power" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13119MapVirgin valueTypes.UnitValue `json:"p13119_map_virgin" PointIgnore:"true"` + P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointName:"PV Power To Grid" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13121MapVirgin valueTypes.UnitValue `json:"p13121_map_virgin" PointIgnore:"true"` + P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointName:"PV Power To Battery" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13126MapVirgin valueTypes.UnitValue `json:"p13126_map_virgin" PointIgnore:"true"` + P13141 valueTypes.Float `json:"p13141" PointId:"p13141" PointName:"Battery Charge Percent" PointIcon:"mdi:battery" PointVirtual:"true" PointVirtualShift:"3" PointUnit:"%" PointUpdateFreq:"UpdateFreq5Mins"` + P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointName:"Grid Power To Load" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13149MapVirgin valueTypes.UnitValue `json:"p13149_map_virgin" PointIgnore:"true"` + P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointVirtual:"true" PointVirtualShift:"3" PointUpdateFreq:"UpdateFreq5Mins"` + P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"` } `json:"storage_inverter_data" PointId:"inverter"` - RobotNumSweepCapacity struct { + RobotNumSweepCapacity struct { Num valueTypes.Integer `json:"num" PointId:"num" PointUpdateFreq:"UpdateFreqBoot"` SweepCapacity valueTypes.Float `json:"sweep_capacity" PointId:"sweep_capacity" PointUpdateFreq:"UpdateFreqBoot"` } `json:"robot_num_sweep_capacity" PointId:"robot"` @@ -154,7 +155,7 @@ func (e *ResultData) IsValid() error { func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() - entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String())) // , e.Response.ResultData.PsKey.String() + entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String())) // , e.Response.ResultData.PsKey.String() // for range Only.Once { // diff --git a/iSolarCloud/AppService/getPsDetailWithPsType/struct.go b/iSolarCloud/AppService/getPsDetailWithPsType/struct.go index be8478cd0..fd211e463 100644 --- a/iSolarCloud/AppService/getPsDetailWithPsType/struct.go +++ b/iSolarCloud/AppService/getPsDetailWithPsType/struct.go @@ -5,9 +5,9 @@ package getPsDetailWithPsType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsHealthState/data.go b/iSolarCloud/AppService/getPsHealthState/data.go index 363f7db8e..6e3957b50 100644 --- a/iSolarCloud/AppService/getPsHealthState/data.go +++ b/iSolarCloud/AppService/getPsHealthState/data.go @@ -1,10 +1,11 @@ package getPsHealthState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/getPsHealthState/struct.go b/iSolarCloud/AppService/getPsHealthState/struct.go index 09ed79006..7055e4b9d 100644 --- a/iSolarCloud/AppService/getPsHealthState/struct.go +++ b/iSolarCloud/AppService/getPsHealthState/struct.go @@ -5,9 +5,9 @@ package getPsHealthState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsInstallerByPsId/data.go b/iSolarCloud/AppService/getPsInstallerByPsId/data.go index 2cf5083ef..b78027e4f 100644 --- a/iSolarCloud/AppService/getPsInstallerByPsId/data.go +++ b/iSolarCloud/AppService/getPsInstallerByPsId/data.go @@ -1,9 +1,9 @@ package getPsInstallerByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "AppService.getPsInstallerByPsId" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { PsId valueTypes.Integer `json:"ps_id"` PsType valueTypes.Integer `json:"ps_type"` RootOrgId valueTypes.Integer `json:"root_org_id"` diff --git a/iSolarCloud/AppService/getPsInstallerByPsId/struct.go b/iSolarCloud/AppService/getPsInstallerByPsId/struct.go index 693a9a900..ba763e22b 100644 --- a/iSolarCloud/AppService/getPsInstallerByPsId/struct.go +++ b/iSolarCloud/AppService/getPsInstallerByPsId/struct.go @@ -5,9 +5,9 @@ package getPsInstallerByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go index 1734ec1e0..073ae57f0 100644 --- a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go +++ b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go @@ -1,9 +1,9 @@ package getPsInstallerOrgInfoByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -25,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { PsOrgInfoList []struct { OrgId valueTypes.Integer `json:"org_id"` OrgName valueTypes.String `json:"org_name"` @@ -45,7 +44,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() entries.StructToDataMap(*e, "", GoStruct.EndPointPath{}) diff --git a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go index 923c6ad2f..534cfc4c9 100644 --- a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go +++ b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go @@ -5,9 +5,9 @@ package getPsInstallerOrgInfoByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsList/data.go b/iSolarCloud/AppService/getPsList/data.go index 9b4c7256f..101a73c2f 100644 --- a/iSolarCloud/AppService/getPsList/data.go +++ b/iSolarCloud/AppService/getPsList/data.go @@ -1,11 +1,12 @@ package getPsList import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsList" diff --git a/iSolarCloud/AppService/getPsList/funcs.go b/iSolarCloud/AppService/getPsList/funcs.go index 7ea0cd8cb..8119ba08a 100644 --- a/iSolarCloud/AppService/getPsList/funcs.go +++ b/iSolarCloud/AppService/getPsList/funcs.go @@ -1,11 +1,10 @@ package getPsList import ( - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) - // type Device struct { // PsId valueTypes.PsId // PsType valueTypes.Integer diff --git a/iSolarCloud/AppService/getPsList/struct.go b/iSolarCloud/AppService/getPsList/struct.go index 382e6cad0..f64a8d5d9 100644 --- a/iSolarCloud/AppService/getPsList/struct.go +++ b/iSolarCloud/AppService/getPsList/struct.go @@ -5,9 +5,9 @@ package getPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsListByName/data.go b/iSolarCloud/AppService/getPsListByName/data.go index 7e1f1ddd6..0371a45c2 100644 --- a/iSolarCloud/AppService/getPsListByName/data.go +++ b/iSolarCloud/AppService/getPsListByName/data.go @@ -1,10 +1,11 @@ package getPsListByName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsListByName" diff --git a/iSolarCloud/AppService/getPsListByName/struct.go b/iSolarCloud/AppService/getPsListByName/struct.go index 11c261272..8d831bfbe 100644 --- a/iSolarCloud/AppService/getPsListByName/struct.go +++ b/iSolarCloud/AppService/getPsListByName/struct.go @@ -5,9 +5,9 @@ package getPsListByName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go b/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go index 8ebfd5587..839602b67 100644 --- a/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go +++ b/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go @@ -1,10 +1,10 @@ package getPsListForPsDataByPsId import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go b/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go index f245f5bd4..6df36876a 100644 --- a/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go +++ b/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go @@ -5,9 +5,9 @@ package getPsListForPsDataByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsListStaticData/data.go b/iSolarCloud/AppService/getPsListStaticData/data.go index ff136df08..b31508723 100644 --- a/iSolarCloud/AppService/getPsListStaticData/data.go +++ b/iSolarCloud/AppService/getPsListStaticData/data.go @@ -1,10 +1,11 @@ package getPsListStaticData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,13 +27,13 @@ func (rd RequestData) Help() string { type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"GoStruct" PointIdFrom:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` + GoStruct GoStruct.GoStruct `json:"GoStruct" PointIdFrom:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` - PsId valueTypes.PsId `json:"ps_id"` - PsName valueTypes.String `json:"ps_name"` - PsShortName valueTypes.String `json:"ps_short_name"` - PsStatus valueTypes.Bool `json:"ps_status"` - PsType valueTypes.Integer `json:"ps_type"` + PsId valueTypes.PsId `json:"ps_id"` + PsName valueTypes.String `json:"ps_name"` + PsShortName valueTypes.String `json:"ps_short_name"` + PsStatus valueTypes.Bool `json:"ps_status"` + PsType valueTypes.Integer `json:"ps_type"` AreaId interface{} `json:"area_id"` DesignCapacity valueTypes.Float `json:"design_capacity" PointUnit:"W"` diff --git a/iSolarCloud/AppService/getPsListStaticData/struct.go b/iSolarCloud/AppService/getPsListStaticData/struct.go index c6a0cc725..919a92452 100644 --- a/iSolarCloud/AppService/getPsListStaticData/struct.go +++ b/iSolarCloud/AppService/getPsListStaticData/struct.go @@ -5,9 +5,9 @@ package getPsListStaticData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsReport/data.go b/iSolarCloud/AppService/getPsReport/data.go index 8f332f798..b2d751897 100644 --- a/iSolarCloud/AppService/getPsReport/data.go +++ b/iSolarCloud/AppService/getPsReport/data.go @@ -1,9 +1,9 @@ package getPsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -12,7 +12,7 @@ const Disabled = false const EndPointName = "AppService.getPsReport" type RequestData struct { - ReportType valueTypes.Integer `json:"report_type" required:"true"` + ReportType valueTypes.Integer `json:"report_type" required:"true"` DateId valueTypes.DateTime `json:"date_id" required:"true"` } @@ -30,15 +30,15 @@ type ResultData struct { PsDateRangeTotalData TotalData `json:"ps_range_totals"` PsTotalData TotalData `json:"ps_totals"` ReportListData struct { - 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.Count `json:"rowCount" PointId:"row_count"` - - PageList []struct { - GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` + 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.Count `json:"rowCount" PointId:"row_count"` + + PageList []struct { + GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` // GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` PsId valueTypes.PsId `json:"ps_id"` @@ -58,24 +58,24 @@ type ResultData struct { } type TotalData struct { - MinDateId valueTypes.DateTime `json:"min_date_id" PointNameDateFormat:"DateTimeLayout"` + MinDateId valueTypes.DateTime `json:"min_date_id" PointNameDateFormat:"DateTimeLayout"` - Co2Reduce valueTypes.Float `json:"co2_reduce" PointUnitFrom:"Co2ReduceOriginalUnit"` - Co2ReduceMap valueTypes.UnitValue `json:"co2_reduce_map"` - Co2ReduceOriginalUnit valueTypes.String `json:"co2_reduce_original_unit" PointIgnore:"true"` + Co2Reduce valueTypes.Float `json:"co2_reduce" PointUnitFrom:"Co2ReduceOriginalUnit"` + Co2ReduceMap valueTypes.UnitValue `json:"co2_reduce_map"` + Co2ReduceOriginalUnit valueTypes.String `json:"co2_reduce_original_unit" PointIgnore:"true"` PowerQuantityTotal valueTypes.Float `json:"power_quantity_total" PointUnitFrom:"PowerQuantityTotalOriginalUnit"` PowerQuantityTotalMap valueTypes.UnitValue `json:"power_quantity_total_map"` PowerQuantityTotalOriginalUnit valueTypes.String `json:"power_quantity_total_original_unit" PointIgnore:"true"` - TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"` - ProfitList []Profit `json:"profit_list" PointIdReplace:"false"` + TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"` + ProfitList []Profit `json:"profit_list" PointIdReplace:"false"` } type Profit struct { - IncomeUnitId valueTypes.Integer `json:"income_unit_id"` + IncomeUnitId valueTypes.Integer `json:"income_unit_id"` IncomeUnitName valueTypes.String `json:"income_unit_name" PointIgnore:"true"` - TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"` + TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getPsReport/struct.go b/iSolarCloud/AppService/getPsReport/struct.go index c0de8461b..417ce6380 100644 --- a/iSolarCloud/AppService/getPsReport/struct.go +++ b/iSolarCloud/AppService/getPsReport/struct.go @@ -5,9 +5,9 @@ package getPsReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsUser/data.go b/iSolarCloud/AppService/getPsUser/data.go index 16d531809..27a84ad19 100644 --- a/iSolarCloud/AppService/getPsUser/data.go +++ b/iSolarCloud/AppService/getPsUser/data.go @@ -1,11 +1,12 @@ package getPsUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getPsUser" diff --git a/iSolarCloud/AppService/getPsUser/struct.go b/iSolarCloud/AppService/getPsUser/struct.go index 47ab59e72..ead63903a 100644 --- a/iSolarCloud/AppService/getPsUser/struct.go +++ b/iSolarCloud/AppService/getPsUser/struct.go @@ -5,9 +5,9 @@ package getPsUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getPsWeatherList/data.go b/iSolarCloud/AppService/getPsWeatherList/data.go index 0e5cfff15..5a7acfca4 100644 --- a/iSolarCloud/AppService/getPsWeatherList/data.go +++ b/iSolarCloud/AppService/getPsWeatherList/data.go @@ -1,10 +1,11 @@ package getPsWeatherList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsWeatherList" @@ -26,29 +27,29 @@ func (rd RequestData) Help() string { type ResultData struct { WeatherList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"DateTime"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"DateTime"` - DateTime valueTypes.DateTime `json:"date_time" PointNameDateFormat:"DateLayout"` - PsId valueTypes.PsId `json:"ps_id"` + DateTime valueTypes.DateTime `json:"date_time" PointNameDateFormat:"DateLayout"` + PsId valueTypes.PsId `json:"ps_id"` - Chill valueTypes.Float `json:"chill"` - Code valueTypes.Float `json:"code"` - CodeName valueTypes.String `json:"code_name"` - Direction valueTypes.Float `json:"direction"` - HighF valueTypes.Float `json:"high" PointUnit:"F"` - HighC valueTypes.Float `json:"highc" PointUnit:"C"` - Humidity valueTypes.Float `json:"humidity"` - LowF valueTypes.Float `json:"low" PointUnit:"F"` - LowC valueTypes.Float `json:"lowc" PointUnit:"C"` - Pressure valueTypes.Float `json:"pressure" PointUnit:"hPa"` - Rising valueTypes.Float `json:"rising"` + Chill valueTypes.Float `json:"chill"` + Code valueTypes.Float `json:"code"` + CodeName valueTypes.String `json:"code_name"` + Direction valueTypes.Float `json:"direction"` + HighF valueTypes.Float `json:"high" PointUnit:"F"` + HighC valueTypes.Float `json:"highc" PointUnit:"C"` + Humidity valueTypes.Float `json:"humidity"` + LowF valueTypes.Float `json:"low" PointUnit:"F"` + LowC valueTypes.Float `json:"lowc" PointUnit:"C"` + Pressure valueTypes.Float `json:"pressure" PointUnit:"hPa"` + Rising valueTypes.Float `json:"rising"` - Speed valueTypes.Float `json:"speed"` + Speed valueTypes.Float `json:"speed"` - Sunrise valueTypes.Time `json:"sunrise"` - Sunset valueTypes.Time `json:"sunset"` + Sunrise valueTypes.Time `json:"sunrise"` + Sunset valueTypes.Time `json:"sunset"` - Visibility valueTypes.Float `json:"visibility"` + Visibility valueTypes.Float `json:"visibility"` } `json:"weather_list" PointIdFromChild:"DateTime" PointNameDateFormat:"DateLayoutDay" DataTable:"true"` } diff --git a/iSolarCloud/AppService/getPsWeatherList/struct.go b/iSolarCloud/AppService/getPsWeatherList/struct.go index 57320ec43..1dd5057bd 100644 --- a/iSolarCloud/AppService/getPsWeatherList/struct.go +++ b/iSolarCloud/AppService/getPsWeatherList/struct.go @@ -5,9 +5,9 @@ package getPsWeatherList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRechargeOrderDetail/data.go b/iSolarCloud/AppService/getRechargeOrderDetail/data.go index 9cc49024a..0d7e415fc 100644 --- a/iSolarCloud/AppService/getRechargeOrderDetail/data.go +++ b/iSolarCloud/AppService/getRechargeOrderDetail/data.go @@ -1,11 +1,12 @@ package getRechargeOrderDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/getRechargeOrderDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRechargeOrderDetail/struct.go b/iSolarCloud/AppService/getRechargeOrderDetail/struct.go index 4a601a0ec..99592507c 100644 --- a/iSolarCloud/AppService/getRechargeOrderDetail/struct.go +++ b/iSolarCloud/AppService/getRechargeOrderDetail/struct.go @@ -5,9 +5,9 @@ package getRechargeOrderDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go index acb32537e..222f8e0ae 100644 --- a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go +++ b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go @@ -1,11 +1,12 @@ package getRechargeOrderItemDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/getRechargeOrderItemDeviceList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go index ab5020600..0d8f05f75 100644 --- a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go +++ b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go @@ -5,9 +5,9 @@ package getRechargeOrderItemDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRechargeOrderList/data.go b/iSolarCloud/AppService/getRechargeOrderList/data.go index 5e1ca3a66..b445be735 100644 --- a/iSolarCloud/AppService/getRechargeOrderList/data.go +++ b/iSolarCloud/AppService/getRechargeOrderList/data.go @@ -1,11 +1,12 @@ package getRechargeOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/getRechargeOrderList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRechargeOrderList/struct.go b/iSolarCloud/AppService/getRechargeOrderList/struct.go index cef4abdd6..98ff586e5 100644 --- a/iSolarCloud/AppService/getRechargeOrderList/struct.go +++ b/iSolarCloud/AppService/getRechargeOrderList/struct.go @@ -5,9 +5,9 @@ package getRechargeOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRegionalTree/data.go b/iSolarCloud/AppService/getRegionalTree/data.go index 77b66522a..9dd5cfb10 100644 --- a/iSolarCloud/AppService/getRegionalTree/data.go +++ b/iSolarCloud/AppService/getRegionalTree/data.go @@ -1,10 +1,11 @@ package getRegionalTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { ResultList []struct { PsId valueTypes.PsId `json:"ps_id"` Id valueTypes.String `json:"id"` diff --git a/iSolarCloud/AppService/getRegionalTree/struct.go b/iSolarCloud/AppService/getRegionalTree/struct.go index d1fa3cc9d..65b0179cb 100644 --- a/iSolarCloud/AppService/getRegionalTree/struct.go +++ b/iSolarCloud/AppService/getRegionalTree/struct.go @@ -5,9 +5,9 @@ package getRegionalTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRemoteParamSettingList/data.go b/iSolarCloud/AppService/getRemoteParamSettingList/data.go index 07d44ebe4..5663bee1f 100644 --- a/iSolarCloud/AppService/getRemoteParamSettingList/data.go +++ b/iSolarCloud/AppService/getRemoteParamSettingList/data.go @@ -1,9 +1,9 @@ package getRemoteParamSettingList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -15,7 +15,7 @@ const EndPointName = "AppService.getRemoteParamSettingList" type RequestData struct { CurPage valueTypes.Integer `json:"curPage" required:"true"` Size valueTypes.Integer `json:"size" required:"true"` - DeviceType valueTypes.Integer `json:"device_type" required:"true"` + DeviceType valueTypes.Integer `json:"device_type" required:"true"` } func (rd RequestData) IsValid() error { @@ -27,85 +27,84 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"PsId"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"PsId"` - PsId valueTypes.Integer `json:"ps_id"` - PsName valueTypes.String `json:"ps_name"` - PsShortName valueTypes.String `json:"ps_short_name"` + PsId valueTypes.Integer `json:"ps_id"` + PsName valueTypes.String `json:"ps_name"` + PsShortName valueTypes.String `json:"ps_short_name"` - AapProtocolNum valueTypes.String `json:"aap_protocol_num"` - AppProtocolNum valueTypes.String `json:"app_protocol_num"` - CommandStatus valueTypes.Integer `json:"command_status"` - CommunicationDevSn valueTypes.String `json:"communication_dev_sn"` - CommunicationDevUUID valueTypes.Integer `json:"communication_dev_uuid"` - CountryId valueTypes.Integer `json:"country_id"` - CountryName valueTypes.String `json:"country_name"` - DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` - DeviceArea valueTypes.String `json:"device_area"` - DeviceCode valueTypes.Integer `json:"device_code"` - DeviceModel valueTypes.String `json:"device_model"` - DeviceModelId valueTypes.Integer `json:"device_model_id"` - DeviceName valueTypes.String `json:"device_name"` - DeviceProSn valueTypes.String `json:"device_pro_sn"` - DeviceType valueTypes.Integer `json:"device_type"` - GridCompanyName valueTypes.String `json:"grid_company_name"` - GridId interface{} `json:"grid_id"` - GridTypeId valueTypes.Integer `json:"grid_type_id"` - GridTypeName valueTypes.String `json:"grid_type_name"` - GridTypeOriginName valueTypes.String `json:"grid_type_origin_name"` - IacProtocolNum valueTypes.String `json:"iac_protocol_num"` - InverterModelType valueTypes.Integer `json:"inverter_model_type"` - ParamSetCountryId valueTypes.Integer `json:"param_set_country_id"` - LoggerCode valueTypes.Integer `json:"logger_code"` - ShareType valueTypes.String `json:"share_type"` - Sn valueTypes.String `json:"sn"` - RatedPower valueTypes.String `json:"rated_power"` - UUID valueTypes.Integer `json:"uuid"` + AapProtocolNum valueTypes.String `json:"aap_protocol_num"` + AppProtocolNum valueTypes.String `json:"app_protocol_num"` + CommandStatus valueTypes.Integer `json:"command_status"` + CommunicationDevSn valueTypes.String `json:"communication_dev_sn"` + CommunicationDevUUID valueTypes.Integer `json:"communication_dev_uuid"` + CountryId valueTypes.Integer `json:"country_id"` + CountryName valueTypes.String `json:"country_name"` + DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` + DeviceArea valueTypes.String `json:"device_area"` + DeviceCode valueTypes.Integer `json:"device_code"` + DeviceModel valueTypes.String `json:"device_model"` + DeviceModelId valueTypes.Integer `json:"device_model_id"` + DeviceName valueTypes.String `json:"device_name"` + DeviceProSn valueTypes.String `json:"device_pro_sn"` + DeviceType valueTypes.Integer `json:"device_type"` + GridCompanyName valueTypes.String `json:"grid_company_name"` + GridId interface{} `json:"grid_id"` + GridTypeId valueTypes.Integer `json:"grid_type_id"` + GridTypeName valueTypes.String `json:"grid_type_name"` + GridTypeOriginName valueTypes.String `json:"grid_type_origin_name"` + IacProtocolNum valueTypes.String `json:"iac_protocol_num"` + InverterModelType valueTypes.Integer `json:"inverter_model_type"` + ParamSetCountryId valueTypes.Integer `json:"param_set_country_id"` + LoggerCode valueTypes.Integer `json:"logger_code"` + ShareType valueTypes.String `json:"share_type"` + Sn valueTypes.String `json:"sn"` + RatedPower valueTypes.String `json:"rated_power"` + UUID valueTypes.Integer `json:"uuid"` IsCountryCheck valueTypes.Bool `json:"is_country_check"` IsHaveVersion valueTypes.Bool `json:"is_haveversion"` IsInit valueTypes.Bool `json:"is_init"` - IsNeedModbusAddress valueTypes.Bool `json:"is_need_modbus_address"` + IsNeedModbusAddress valueTypes.Bool `json:"is_need_modbus_address"` IsReadSet valueTypes.Bool `json:"is_read_set"` IsReset valueTypes.Bool `json:"is_reset"` - IsSupportParamSet valueTypes.Bool `json:"is_support_param_set"` - IsSupportRemoteUpgrade valueTypes.Bool `json:"is_support_remote_upgrade"` + IsSupportParamSet valueTypes.Bool `json:"is_support_param_set"` + IsSupportRemoteUpgrade valueTypes.Bool `json:"is_support_remote_upgrade"` IsThirdParty valueTypes.Bool `json:"is_third_party"` IsUploadedSelfDesc valueTypes.Bool `json:"is_uploaded_self_desc"` IsUseIacAppProtocol valueTypes.Bool `json:"is_use_iac_app_protocol"` - AapProtocolVersion valueTypes.String `json:"aap_protocol_version"` - AppProtocolVersion valueTypes.String `json:"app_protocol_version"` - ArmVersion valueTypes.String `json:"arm_version"` - BatVersion valueTypes.String `json:"bat_version"` - CpldVersion valueTypes.String `json:"cpld_version"` - IacProtocolVersion valueTypes.String `json:"iac_protocol_version"` - LcdVersion valueTypes.String `json:"lcd_version"` - MVersion valueTypes.String `json:"m_version"` - MachineVersion valueTypes.String `json:"machine_version"` - MasterNodeVersion valueTypes.String `json:"master_node_version"` - McuVersion valueTypes.String `json:"mcu_version"` - MdspVersion valueTypes.String `json:"mdsp_version"` - PvdVersion valueTypes.String `json:"pvd_version"` - SdspVersion valueTypes.String `json:"sdsp_version"` - TempVersion valueTypes.String `json:"temp_version"` - UpgradeVersion valueTypes.String `json:"upgrade_version"` - Version valueTypes.String `json:"version"` - Version1 valueTypes.String `json:"version1"` - Version2 valueTypes.String `json:"version2"` - Version3 valueTypes.String `json:"version3"` - Version4 valueTypes.String `json:"version4"` - Version5 valueTypes.String `json:"version5"` - Version6 valueTypes.String `json:"version6"` - Version7 valueTypes.String `json:"version7"` - Version8 valueTypes.String `json:"version8"` - Version9 valueTypes.String `json:"version9"` - Version10 valueTypes.String `json:"version10"` - Version11 valueTypes.String `json:"version11"` - Version12 valueTypes.String `json:"version12"` + AapProtocolVersion valueTypes.String `json:"aap_protocol_version"` + AppProtocolVersion valueTypes.String `json:"app_protocol_version"` + ArmVersion valueTypes.String `json:"arm_version"` + BatVersion valueTypes.String `json:"bat_version"` + CpldVersion valueTypes.String `json:"cpld_version"` + IacProtocolVersion valueTypes.String `json:"iac_protocol_version"` + LcdVersion valueTypes.String `json:"lcd_version"` + MVersion valueTypes.String `json:"m_version"` + MachineVersion valueTypes.String `json:"machine_version"` + MasterNodeVersion valueTypes.String `json:"master_node_version"` + McuVersion valueTypes.String `json:"mcu_version"` + MdspVersion valueTypes.String `json:"mdsp_version"` + PvdVersion valueTypes.String `json:"pvd_version"` + SdspVersion valueTypes.String `json:"sdsp_version"` + TempVersion valueTypes.String `json:"temp_version"` + UpgradeVersion valueTypes.String `json:"upgrade_version"` + Version valueTypes.String `json:"version"` + Version1 valueTypes.String `json:"version1"` + Version2 valueTypes.String `json:"version2"` + Version3 valueTypes.String `json:"version3"` + Version4 valueTypes.String `json:"version4"` + Version5 valueTypes.String `json:"version5"` + Version6 valueTypes.String `json:"version6"` + Version7 valueTypes.String `json:"version7"` + Version8 valueTypes.String `json:"version8"` + Version9 valueTypes.String `json:"version9"` + Version10 valueTypes.String `json:"version10"` + Version11 valueTypes.String `json:"version11"` + Version12 valueTypes.String `json:"version12"` } `json:"pageList" PointId:"devices" DataTable:"false"` RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } diff --git a/iSolarCloud/AppService/getRemoteParamSettingList/struct.go b/iSolarCloud/AppService/getRemoteParamSettingList/struct.go index 78add5b44..f7bab13c2 100644 --- a/iSolarCloud/AppService/getRemoteParamSettingList/struct.go +++ b/iSolarCloud/AppService/getRemoteParamSettingList/struct.go @@ -5,9 +5,9 @@ package getRemoteParamSettingList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go index 7c0c6da5e..4658c68e9 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go +++ b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go @@ -1,10 +1,11 @@ package getRemoteUpgradeDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -28,7 +29,7 @@ func (rd RequestData) Help() string { type ResultData struct { MModuleNameList []valueTypes.String `json:"m_module_name_list" PointId:"module_names"` PageList []struct { - GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsKey" PointIdReplace:"true"` + GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsKey" PointIdReplace:"true"` PsKey valueTypes.PsKey `json:"ps_key"` PsId valueTypes.PsId `json:"ps_id"` diff --git a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go index 6e1d98147..878cc7304 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go +++ b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go @@ -5,9 +5,9 @@ package getRemoteUpgradeDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go index b4f5c4df8..95f7242f0 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go +++ b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go @@ -1,11 +1,12 @@ package getRemoteUpgradeScheduleDetails import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getRemoteUpgradeScheduleDetails" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go index ba1a0f082..7c384d50b 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go +++ b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go @@ -5,9 +5,9 @@ package getRemoteUpgradeScheduleDetails import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go index be2c8e146..7eb8cb53c 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go +++ b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go @@ -1,11 +1,12 @@ package getRemoteUpgradeSubTasksList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getRemoteUpgradeSubTasksList" @@ -27,8 +28,8 @@ func (rd RequestData) Help() string { } type ResultData struct { - PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true"` - RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` + PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true"` + RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go index 0f21e97f3..4ea77ddd5 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go +++ b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go @@ -5,9 +5,9 @@ package getRemoteUpgradeSubTasksList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go b/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go index 06385e70f..6e0100735 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go +++ b/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go @@ -1,10 +1,11 @@ package getRemoteUpgradeTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getRemoteUpgradeTaskList" diff --git a/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go index ef9672fbf..aed64e6a1 100644 --- a/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go +++ b/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go @@ -5,9 +5,9 @@ package getRemoteUpgradeTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getReportData/data.go b/iSolarCloud/AppService/getReportData/data.go index e7f5f9e46..a0bec9081 100644 --- a/iSolarCloud/AppService/getReportData/data.go +++ b/iSolarCloud/AppService/getReportData/data.go @@ -1,10 +1,10 @@ package getReportData import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getReportData" diff --git a/iSolarCloud/AppService/getReportData/struct.go b/iSolarCloud/AppService/getReportData/struct.go index fd9ace06c..389389484 100644 --- a/iSolarCloud/AppService/getReportData/struct.go +++ b/iSolarCloud/AppService/getReportData/struct.go @@ -5,9 +5,9 @@ package getReportData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go index 1ff7aa596..b20f1c835 100644 --- a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go +++ b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go @@ -1,11 +1,12 @@ package getReportEmailConfigInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getReportEmailConfigInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { ReportEmailConfigInfoList []struct { Email valueTypes.String `json:"email"` diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go b/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go index 9185dafad..e4ba8f13f 100644 --- a/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go +++ b/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go @@ -5,9 +5,9 @@ package getReportEmailConfigInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getReportExportColumns/data.go b/iSolarCloud/AppService/getReportExportColumns/data.go index a7579e2d8..b29f99470 100644 --- a/iSolarCloud/AppService/getReportExportColumns/data.go +++ b/iSolarCloud/AppService/getReportExportColumns/data.go @@ -1,11 +1,12 @@ package getReportExportColumns import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getReportExportColumns" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getReportExportColumns/struct.go b/iSolarCloud/AppService/getReportExportColumns/struct.go index b967ba4f0..d5a4de95d 100644 --- a/iSolarCloud/AppService/getReportExportColumns/struct.go +++ b/iSolarCloud/AppService/getReportExportColumns/struct.go @@ -5,9 +5,9 @@ package getReportExportColumns import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getReportListByUserId/data.go b/iSolarCloud/AppService/getReportListByUserId/data.go index 6832088b3..ffc44a29b 100644 --- a/iSolarCloud/AppService/getReportListByUserId/data.go +++ b/iSolarCloud/AppService/getReportListByUserId/data.go @@ -1,11 +1,12 @@ package getReportListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getReportListByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getReportListByUserId/struct.go b/iSolarCloud/AppService/getReportListByUserId/struct.go index 71de57e0c..26ca437e1 100644 --- a/iSolarCloud/AppService/getReportListByUserId/struct.go +++ b/iSolarCloud/AppService/getReportListByUserId/struct.go @@ -5,9 +5,9 @@ package getReportListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go b/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go index f908b99d2..2334c7863 100644 --- a/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go +++ b/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go @@ -1,10 +1,11 @@ package getRobotDynamicCleaningView import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "AppService.getRobotDynamicCleaningView" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { DynamicRobot []interface{} `json:"dynamic_robot"` LoggerSn []interface{} `json:"logger_sn"` diff --git a/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go b/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go index 2e99641ba..2962e0bf5 100644 --- a/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go +++ b/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go @@ -5,9 +5,9 @@ package getRobotDynamicCleaningView import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go index 109bad28d..3f5f89f37 100644 --- a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go +++ b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go @@ -1,11 +1,12 @@ package getRobotNumAndSweepCapacity import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getRobotNumAndSweepCapacity" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go index 4759e2134..c7ce183e0 100644 --- a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go +++ b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go @@ -5,9 +5,9 @@ package getRobotNumAndSweepCapacity import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getRuleUnit/data.go b/iSolarCloud/AppService/getRuleUnit/data.go index 02e738de7..a23b250b5 100644 --- a/iSolarCloud/AppService/getRuleUnit/data.go +++ b/iSolarCloud/AppService/getRuleUnit/data.go @@ -1,11 +1,12 @@ package getRuleUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getRuleUnit" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getRuleUnit/struct.go b/iSolarCloud/AppService/getRuleUnit/struct.go index b19d36219..3724110e4 100644 --- a/iSolarCloud/AppService/getRuleUnit/struct.go +++ b/iSolarCloud/AppService/getRuleUnit/struct.go @@ -5,9 +5,9 @@ package getRuleUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSendReportConfigCron/data.go b/iSolarCloud/AppService/getSendReportConfigCron/data.go index f2fe78297..0506afd97 100644 --- a/iSolarCloud/AppService/getSendReportConfigCron/data.go +++ b/iSolarCloud/AppService/getSendReportConfigCron/data.go @@ -1,11 +1,12 @@ package getSendReportConfigCron import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { Schedule Schedule `json:"schedule"` // One valueTypes.String `json:"1"` diff --git a/iSolarCloud/AppService/getSendReportConfigCron/struct.go b/iSolarCloud/AppService/getSendReportConfigCron/struct.go index f79a98984..ab107e4ac 100644 --- a/iSolarCloud/AppService/getSendReportConfigCron/struct.go +++ b/iSolarCloud/AppService/getSendReportConfigCron/struct.go @@ -5,9 +5,9 @@ package getSendReportConfigCron import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSerialNum/data.go b/iSolarCloud/AppService/getSerialNum/data.go index eeb35ce5e..5662fec95 100644 --- a/iSolarCloud/AppService/getSerialNum/data.go +++ b/iSolarCloud/AppService/getSerialNum/data.go @@ -1,11 +1,12 @@ package getSerialNum import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSerialNum" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSerialNum/struct.go b/iSolarCloud/AppService/getSerialNum/struct.go index fbf362cf9..224b5e81c 100644 --- a/iSolarCloud/AppService/getSerialNum/struct.go +++ b/iSolarCloud/AppService/getSerialNum/struct.go @@ -5,9 +5,9 @@ package getSerialNum import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getShieldMapConditionList/data.go b/iSolarCloud/AppService/getShieldMapConditionList/data.go index 79473e4d6..7607576c3 100644 --- a/iSolarCloud/AppService/getShieldMapConditionList/data.go +++ b/iSolarCloud/AppService/getShieldMapConditionList/data.go @@ -1,11 +1,12 @@ package getShieldMapConditionList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getShieldMapConditionList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getShieldMapConditionList/struct.go b/iSolarCloud/AppService/getShieldMapConditionList/struct.go index bc104d104..fd0c34fde 100644 --- a/iSolarCloud/AppService/getShieldMapConditionList/struct.go +++ b/iSolarCloud/AppService/getShieldMapConditionList/struct.go @@ -5,9 +5,9 @@ package getShieldMapConditionList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSimIdBySnList/data.go b/iSolarCloud/AppService/getSimIdBySnList/data.go index c70408da4..a97c68fc0 100644 --- a/iSolarCloud/AppService/getSimIdBySnList/data.go +++ b/iSolarCloud/AppService/getSimIdBySnList/data.go @@ -1,11 +1,12 @@ package getSimIdBySnList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSimIdBySnList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSimIdBySnList/struct.go b/iSolarCloud/AppService/getSimIdBySnList/struct.go index 731b72e81..2a4ac9609 100644 --- a/iSolarCloud/AppService/getSimIdBySnList/struct.go +++ b/iSolarCloud/AppService/getSimIdBySnList/struct.go @@ -5,9 +5,9 @@ package getSimIdBySnList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSingleIVData/data.go b/iSolarCloud/AppService/getSingleIVData/data.go index 5e4834d5e..5597407dc 100644 --- a/iSolarCloud/AppService/getSingleIVData/data.go +++ b/iSolarCloud/AppService/getSingleIVData/data.go @@ -1,11 +1,12 @@ package getSingleIVData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSingleIVData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSingleIVData/struct.go b/iSolarCloud/AppService/getSingleIVData/struct.go index 3f2b806d1..c5bb306e1 100644 --- a/iSolarCloud/AppService/getSingleIVData/struct.go +++ b/iSolarCloud/AppService/getSingleIVData/struct.go @@ -5,9 +5,9 @@ package getSingleIVData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSnChangeRecord/data.go b/iSolarCloud/AppService/getSnChangeRecord/data.go index 83340f050..b1f808fcb 100644 --- a/iSolarCloud/AppService/getSnChangeRecord/data.go +++ b/iSolarCloud/AppService/getSnChangeRecord/data.go @@ -1,11 +1,12 @@ package getSnChangeRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSnChangeRecord" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSnChangeRecord/struct.go b/iSolarCloud/AppService/getSnChangeRecord/struct.go index 5884a1b7b..78b89f460 100644 --- a/iSolarCloud/AppService/getSnChangeRecord/struct.go +++ b/iSolarCloud/AppService/getSnChangeRecord/struct.go @@ -5,9 +5,9 @@ package getSnChangeRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSnConnectionInfo/data.go b/iSolarCloud/AppService/getSnConnectionInfo/data.go index b3cc8db5a..751044e85 100644 --- a/iSolarCloud/AppService/getSnConnectionInfo/data.go +++ b/iSolarCloud/AppService/getSnConnectionInfo/data.go @@ -1,9 +1,9 @@ package getSnConnectionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -26,8 +26,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { CurPage valueTypes.Integer `json:"curPage" PointId:"cur_page"` IsMore valueTypes.Integer `json:"isMore" PointId:"is_more"` PageList []interface{} `json:"pageList" PointId:"page_list"` diff --git a/iSolarCloud/AppService/getSnConnectionInfo/struct.go b/iSolarCloud/AppService/getSnConnectionInfo/struct.go index 2b100bbe8..b7ffdc514 100644 --- a/iSolarCloud/AppService/getSnConnectionInfo/struct.go +++ b/iSolarCloud/AppService/getSnConnectionInfo/struct.go @@ -5,9 +5,9 @@ package getSnConnectionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getStationInfoSql/data.go b/iSolarCloud/AppService/getStationInfoSql/data.go index ccb6cf397..94deba9a1 100644 --- a/iSolarCloud/AppService/getStationInfoSql/data.go +++ b/iSolarCloud/AppService/getStationInfoSql/data.go @@ -1,11 +1,12 @@ package getStationInfoSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getStationInfoSql" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getStationInfoSql/struct.go b/iSolarCloud/AppService/getStationInfoSql/struct.go index ff8b6c034..22798dcd6 100644 --- a/iSolarCloud/AppService/getStationInfoSql/struct.go +++ b/iSolarCloud/AppService/getStationInfoSql/struct.go @@ -5,9 +5,9 @@ package getStationInfoSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSungwsConfigCache/data.go b/iSolarCloud/AppService/getSungwsConfigCache/data.go index 5dc767b5e..bbbf41952 100644 --- a/iSolarCloud/AppService/getSungwsConfigCache/data.go +++ b/iSolarCloud/AppService/getSungwsConfigCache/data.go @@ -1,11 +1,12 @@ package getSungwsConfigCache import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getSungwsConfigCache" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSungwsConfigCache/struct.go b/iSolarCloud/AppService/getSungwsConfigCache/struct.go index b7b6fb305..6f936deef 100644 --- a/iSolarCloud/AppService/getSungwsConfigCache/struct.go +++ b/iSolarCloud/AppService/getSungwsConfigCache/struct.go @@ -5,9 +5,9 @@ package getSungwsConfigCache import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go b/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go index 8eea26e63..875ee4a33 100644 --- a/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go +++ b/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go @@ -1,10 +1,11 @@ package getSungwsGlobalConfigCache import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -26,94 +27,92 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { Config map[string]Config `json:"config" DataTable:"true"` } type Config struct { - Id valueTypes.Integer `json:"id"` - CreateTime valueTypes.DateTime `json:"create_time"` - UpdateTime valueTypes.DateTime `json:"update_time"` + Id valueTypes.Integer `json:"id"` + CreateTime valueTypes.DateTime `json:"create_time"` + UpdateTime valueTypes.DateTime `json:"update_time"` - CheckState valueTypes.String `json:"check_state"` - CreateUser valueTypes.Integer `json:"create_user"` - DevKey valueTypes.String `json:"dev_key"` - DevKeyNew valueTypes.String `json:"dev_key_new"` - EnAbbr valueTypes.String `json:"en_abbr"` - EntryCategory valueTypes.Integer `json:"entry_category"` - EntryPermission valueTypes.Integer `json:"entry_permission"` - IndustryStandard valueTypes.String `json:"industry_standard"` - ItemType valueTypes.Integer `json:"item_type"` - LogicDel valueTypes.Integer `json:"logic_del"` - Module valueTypes.String `json:"module"` - NeutralTransId valueTypes.Integer `json:"neutral_trans_id"` - OldId valueTypes.Integer `json:"old_id"` - Path valueTypes.String `json:"path"` - Polysemy valueTypes.Integer `json:"polysemy"` - TermMaxLength valueTypes.String `json:"term_max_length"` - Type valueTypes.Integer `json:"type"` - UpdateUser valueTypes.Integer `json:"update_user"` + CheckState valueTypes.String `json:"check_state"` + CreateUser valueTypes.Integer `json:"create_user"` + DevKey valueTypes.String `json:"dev_key"` + DevKeyNew valueTypes.String `json:"dev_key_new"` + EnAbbr valueTypes.String `json:"en_abbr"` + EntryCategory valueTypes.Integer `json:"entry_category"` + EntryPermission valueTypes.Integer `json:"entry_permission"` + IndustryStandard valueTypes.String `json:"industry_standard"` + ItemType valueTypes.Integer `json:"item_type"` + LogicDel valueTypes.Integer `json:"logic_del"` + Module valueTypes.String `json:"module"` + NeutralTransId valueTypes.Integer `json:"neutral_trans_id"` + OldId valueTypes.Integer `json:"old_id"` + Path valueTypes.String `json:"path"` + Polysemy valueTypes.Integer `json:"polysemy"` + TermMaxLength valueTypes.String `json:"term_max_length"` + Type valueTypes.Integer `json:"type"` + UpdateUser valueTypes.Integer `json:"update_user"` - IsAPI valueTypes.Bool `json:"is_api"` - IsApp valueTypes.Bool `json:"is_app"` - IsAppJs valueTypes.Bool `json:"is_app_js"` - IsAutoCreate valueTypes.Bool `json:"is_auto_create"` - IsConfig valueTypes.Bool `json:"is_config"` - IsDB valueTypes.Bool `json:"is_db"` - IsEmbeddedDevice valueTypes.Bool `json:"is_embedded_device"` - IsEmsPpc valueTypes.Bool `json:"is_ems_ppc"` - IsEmsPpcXML valueTypes.Bool `json:"is_ems_ppc_xml"` - IsEsp valueTypes.Bool `json:"is_esp"` - IsIconfigJs valueTypes.Bool `json:"is_iconfig_js"` - IsImportant valueTypes.Bool `json:"is_important"` - IsInsightJs valueTypes.Bool `json:"is_insight_js"` - IsInsightProperties valueTypes.Bool `json:"is_insight_properties"` - IsIscapp valueTypes.Bool `json:"is_iscapp"` - IsIshapp valueTypes.Bool `json:"is_ishapp"` - IsIsolarDesign valueTypes.Bool `json:"is_isolar_design"` - IsLogger valueTypes.Bool `json:"is_logger"` - IsLoggerConfigJs valueTypes.Bool `json:"is_logger_config_js"` - IsMachineJs valueTypes.Bool `json:"is_machine_js"` - IsMenu valueTypes.Bool `json:"is_menu"` - IsNewWeb valueTypes.Bool `json:"is_new_web"` - IsPoint valueTypes.Bool `json:"is_point"` - IsQuerytoolJs valueTypes.Bool `json:"is_querytool_js"` - IsRichtext valueTypes.Bool `json:"is_richtext"` - IsSasapp valueTypes.Bool `json:"is_sasapp"` - IsScreenJs valueTypes.Bool `json:"is_screen_js"` - IsScreenProperties valueTypes.Bool `json:"is_screen_properties"` - IsScuProperties valueTypes.Bool `json:"is_scu_properties"` - IsScuXML valueTypes.Bool `json:"is_scu_xml"` - IsStandard valueTypes.Bool `json:"is_standard"` - IsTerm valueTypes.Bool `json:"is_term"` - IsWebJs valueTypes.Bool `json:"is_web_js"` - IsWebProperties valueTypes.Bool `json:"is_web_properties"` - IsWinet valueTypes.Bool `json:"is_winet"` + IsAPI valueTypes.Bool `json:"is_api"` + IsApp valueTypes.Bool `json:"is_app"` + IsAppJs valueTypes.Bool `json:"is_app_js"` + IsAutoCreate valueTypes.Bool `json:"is_auto_create"` + IsConfig valueTypes.Bool `json:"is_config"` + IsDB valueTypes.Bool `json:"is_db"` + IsEmbeddedDevice valueTypes.Bool `json:"is_embedded_device"` + IsEmsPpc valueTypes.Bool `json:"is_ems_ppc"` + IsEmsPpcXML valueTypes.Bool `json:"is_ems_ppc_xml"` + IsEsp valueTypes.Bool `json:"is_esp"` + IsIconfigJs valueTypes.Bool `json:"is_iconfig_js"` + IsImportant valueTypes.Bool `json:"is_important"` + IsInsightJs valueTypes.Bool `json:"is_insight_js"` + IsInsightProperties valueTypes.Bool `json:"is_insight_properties"` + IsIscapp valueTypes.Bool `json:"is_iscapp"` + IsIshapp valueTypes.Bool `json:"is_ishapp"` + IsIsolarDesign valueTypes.Bool `json:"is_isolar_design"` + IsLogger valueTypes.Bool `json:"is_logger"` + IsLoggerConfigJs valueTypes.Bool `json:"is_logger_config_js"` + IsMachineJs valueTypes.Bool `json:"is_machine_js"` + IsMenu valueTypes.Bool `json:"is_menu"` + IsNewWeb valueTypes.Bool `json:"is_new_web"` + IsPoint valueTypes.Bool `json:"is_point"` + IsQuerytoolJs valueTypes.Bool `json:"is_querytool_js"` + IsRichtext valueTypes.Bool `json:"is_richtext"` + IsSasapp valueTypes.Bool `json:"is_sasapp"` + IsScreenJs valueTypes.Bool `json:"is_screen_js"` + IsScreenProperties valueTypes.Bool `json:"is_screen_properties"` + IsScuProperties valueTypes.Bool `json:"is_scu_properties"` + IsScuXML valueTypes.Bool `json:"is_scu_xml"` + IsStandard valueTypes.Bool `json:"is_standard"` + IsTerm valueTypes.Bool `json:"is_term"` + IsWebJs valueTypes.Bool `json:"is_web_js"` + IsWebProperties valueTypes.Bool `json:"is_web_properties"` + IsWinet valueTypes.Bool `json:"is_winet"` - Scenarios valueTypes.String `json:"scenarios"` - Background valueTypes.String `json:"background"` - Meaning valueTypes.String `json:"meaning"` - Remark valueTypes.String `json:"remark"` - ValueEnUs valueTypes.String `json:"value_en_us"` - - Value valueTypes.String `json:"value"` - ValueDeDe valueTypes.String `json:"value_de_de"` - ValueEsEs valueTypes.String `json:"value_es_es"` - ValueFrFr valueTypes.String `json:"value_fr_fr"` - ValueIDID valueTypes.String `json:"value_id_id"` - ValueItIt valueTypes.String `json:"value_it_it"` - ValueJaJp valueTypes.String `json:"value_ja_jp"` - ValueKoKr valueTypes.String `json:"value_ko_kr"` - ValueNlNl valueTypes.String `json:"value_nl_nl"` - ValuePlPl valueTypes.String `json:"value_pl_pl"` - ValuePtBr valueTypes.String `json:"value_pt_br"` - ValuePtPt valueTypes.String `json:"value_pt_pt"` - ValueTrTr valueTypes.String `json:"value_tr_tr"` - ValueUkUa valueTypes.String `json:"value_uk_ua"` - ValueViVn valueTypes.String `json:"value_vi_vn"` - ValueZhTw valueTypes.String `json:"value_zh_tw"` + Scenarios valueTypes.String `json:"scenarios"` + Background valueTypes.String `json:"background"` + Meaning valueTypes.String `json:"meaning"` + Remark valueTypes.String `json:"remark"` + ValueEnUs valueTypes.String `json:"value_en_us"` + Value valueTypes.String `json:"value"` + ValueDeDe valueTypes.String `json:"value_de_de"` + ValueEsEs valueTypes.String `json:"value_es_es"` + ValueFrFr valueTypes.String `json:"value_fr_fr"` + ValueIDID valueTypes.String `json:"value_id_id"` + ValueItIt valueTypes.String `json:"value_it_it"` + ValueJaJp valueTypes.String `json:"value_ja_jp"` + ValueKoKr valueTypes.String `json:"value_ko_kr"` + ValueNlNl valueTypes.String `json:"value_nl_nl"` + ValuePlPl valueTypes.String `json:"value_pl_pl"` + ValuePtBr valueTypes.String `json:"value_pt_br"` + ValuePtPt valueTypes.String `json:"value_pt_pt"` + ValueTrTr valueTypes.String `json:"value_tr_tr"` + ValueUkUa valueTypes.String `json:"value_uk_ua"` + ValueViVn valueTypes.String `json:"value_vi_vn"` + ValueZhTw valueTypes.String `json:"value_zh_tw"` } func (e *ResultData) UnmarshalJSON(data []byte) error { @@ -148,7 +147,6 @@ func (e *EndPoint) GetData() api.DataMap { return entries } - const ( I18NCHANGECOMMUNICATIONMODULESTATUS = "I18NCHANGECOMMUNICATIONMODULESTATUS" I18NCOMMON100MILLIONS = "I18NCOMMON100MILLIONS" diff --git a/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go b/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go index 6b2bd8001..9ef9b1b1e 100644 --- a/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go +++ b/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go @@ -5,9 +5,9 @@ package getSungwsGlobalConfigCache import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go b/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go index d39fa7584..c629af6cf 100644 --- a/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go +++ b/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go @@ -1,11 +1,12 @@ package getSweepDevParamSetTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSweepDevParamSetTemplate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go b/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go index 46623b532..726b193de 100644 --- a/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go +++ b/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go @@ -5,9 +5,9 @@ package getSweepDevParamSetTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSweepRobotDevList/data.go b/iSolarCloud/AppService/getSweepRobotDevList/data.go index 1db8348db..e84b10a27 100644 --- a/iSolarCloud/AppService/getSweepRobotDevList/data.go +++ b/iSolarCloud/AppService/getSweepRobotDevList/data.go @@ -1,11 +1,12 @@ package getSweepRobotDevList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSweepRobotDevList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSweepRobotDevList/struct.go b/iSolarCloud/AppService/getSweepRobotDevList/struct.go index 74625005b..aa4bac1f0 100644 --- a/iSolarCloud/AppService/getSweepRobotDevList/struct.go +++ b/iSolarCloud/AppService/getSweepRobotDevList/struct.go @@ -5,9 +5,9 @@ package getSweepRobotDevList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSysMsg/data.go b/iSolarCloud/AppService/getSysMsg/data.go index 9f5b82047..e72b08fb0 100644 --- a/iSolarCloud/AppService/getSysMsg/data.go +++ b/iSolarCloud/AppService/getSysMsg/data.go @@ -1,10 +1,11 @@ package getSysMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CreateTime" PointIdReplace:"false"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CreateTime" PointIdReplace:"false"` MsgId valueTypes.Integer `json:"msg_id"` CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` @@ -40,46 +41,46 @@ type ResultData []struct { 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"` - RemindType valueTypes.Integer `json:"remind_type"` - OperateType valueTypes.Integer `json:"operate_type"` - OperateURL valueTypes.String `json:"operate_url"` - AttachNames interface{} `json:"attach_names"` - AttachPath interface{} `json:"attach_path"` + TypeId valueTypes.Integer `json:"type_id"` + BusinessId valueTypes.Integer `json:"business_id"` + ClickNum valueTypes.Integer `json:"click_num"` + RemindType valueTypes.Integer `json:"remind_type"` + OperateType valueTypes.Integer `json:"operate_type"` + OperateURL valueTypes.String `json:"operate_url"` + 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"` + 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"` + 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 { @@ -87,7 +88,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/getSysMsg/struct.go b/iSolarCloud/AppService/getSysMsg/struct.go index 087c908ac..288a2370d 100644 --- a/iSolarCloud/AppService/getSysMsg/struct.go +++ b/iSolarCloud/AppService/getSysMsg/struct.go @@ -5,9 +5,9 @@ package getSysMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSysOrgNewList/data.go b/iSolarCloud/AppService/getSysOrgNewList/data.go index c8e6b0c8d..e44c28b4a 100644 --- a/iSolarCloud/AppService/getSysOrgNewList/data.go +++ b/iSolarCloud/AppService/getSysOrgNewList/data.go @@ -1,11 +1,12 @@ package getSysOrgNewList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getSysOrgNewList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSysOrgNewList/struct.go b/iSolarCloud/AppService/getSysOrgNewList/struct.go index e94d9c2d9..105058558 100644 --- a/iSolarCloud/AppService/getSysOrgNewList/struct.go +++ b/iSolarCloud/AppService/getSysOrgNewList/struct.go @@ -5,9 +5,9 @@ package getSysOrgNewList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSysOrgNewOne/data.go b/iSolarCloud/AppService/getSysOrgNewOne/data.go index 4e2162c76..769a6790b 100644 --- a/iSolarCloud/AppService/getSysOrgNewOne/data.go +++ b/iSolarCloud/AppService/getSysOrgNewOne/data.go @@ -1,11 +1,12 @@ package getSysOrgNewOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getSysOrgNewOne" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSysOrgNewOne/struct.go b/iSolarCloud/AppService/getSysOrgNewOne/struct.go index 39cf9e1d3..0b48a0368 100644 --- a/iSolarCloud/AppService/getSysOrgNewOne/struct.go +++ b/iSolarCloud/AppService/getSysOrgNewOne/struct.go @@ -5,9 +5,9 @@ package getSysOrgNewOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getSysUserById/data.go b/iSolarCloud/AppService/getSysUserById/data.go index 804f2cf4b..a69625dd7 100644 --- a/iSolarCloud/AppService/getSysUserById/data.go +++ b/iSolarCloud/AppService/getSysUserById/data.go @@ -1,11 +1,12 @@ package getSysUserById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getSysUserById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getSysUserById/struct.go b/iSolarCloud/AppService/getSysUserById/struct.go index 0060d11b3..4d7dd4f7e 100644 --- a/iSolarCloud/AppService/getSysUserById/struct.go +++ b/iSolarCloud/AppService/getSysUserById/struct.go @@ -5,9 +5,9 @@ package getSysUserById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getTableDataSql/data.go b/iSolarCloud/AppService/getTableDataSql/data.go index c1e112cc3..9fc69040f 100644 --- a/iSolarCloud/AppService/getTableDataSql/data.go +++ b/iSolarCloud/AppService/getTableDataSql/data.go @@ -1,11 +1,12 @@ package getTableDataSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getTableDataSql" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getTableDataSql/struct.go b/iSolarCloud/AppService/getTableDataSql/struct.go index fe7ef5a01..f797dba7a 100644 --- a/iSolarCloud/AppService/getTableDataSql/struct.go +++ b/iSolarCloud/AppService/getTableDataSql/struct.go @@ -5,9 +5,9 @@ package getTableDataSql import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getTableDataSqlCount/data.go b/iSolarCloud/AppService/getTableDataSqlCount/data.go index bcb274432..502dc763f 100644 --- a/iSolarCloud/AppService/getTableDataSqlCount/data.go +++ b/iSolarCloud/AppService/getTableDataSqlCount/data.go @@ -1,11 +1,12 @@ package getTableDataSqlCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getTableDataSqlCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getTableDataSqlCount/struct.go b/iSolarCloud/AppService/getTableDataSqlCount/struct.go index d3dbb9a7f..0fc2a3643 100644 --- a/iSolarCloud/AppService/getTableDataSqlCount/struct.go +++ b/iSolarCloud/AppService/getTableDataSqlCount/struct.go @@ -5,9 +5,9 @@ package getTableDataSqlCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getTemplateByInfoType/data.go b/iSolarCloud/AppService/getTemplateByInfoType/data.go index 20e39ebd4..9513133e7 100644 --- a/iSolarCloud/AppService/getTemplateByInfoType/data.go +++ b/iSolarCloud/AppService/getTemplateByInfoType/data.go @@ -1,11 +1,12 @@ package getTemplateByInfoType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/messageService/getTemplateByInfoType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getTemplateByInfoType/struct.go b/iSolarCloud/AppService/getTemplateByInfoType/struct.go index 958fbb490..3df2c352e 100644 --- a/iSolarCloud/AppService/getTemplateByInfoType/struct.go +++ b/iSolarCloud/AppService/getTemplateByInfoType/struct.go @@ -5,9 +5,9 @@ package getTemplateByInfoType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getTemplateList/data.go b/iSolarCloud/AppService/getTemplateList/data.go index 8b1f671e5..d164599e8 100644 --- a/iSolarCloud/AppService/getTemplateList/data.go +++ b/iSolarCloud/AppService/getTemplateList/data.go @@ -1,10 +1,11 @@ package getTemplateList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getTemplateList" @@ -24,13 +25,13 @@ func (rd RequestData) Help() string { } type ResultData struct { - PageList []Template `json:"pageList" PointId:"page_list" DataTable:"true" DataTableSortOn:"UpdateTime"` + PageList []Template `json:"pageList" PointId:"page_list" DataTable:"true" DataTableSortOn:"UpdateTime"` RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } type Template struct { TemplateId valueTypes.Integer `json:"template_id"` - TemplateName valueTypes.String `json:"template_name"` + TemplateName valueTypes.String `json:"template_name"` UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` } diff --git a/iSolarCloud/AppService/getTemplateList/struct.go b/iSolarCloud/AppService/getTemplateList/struct.go index f87def06b..572eabe06 100644 --- a/iSolarCloud/AppService/getTemplateList/struct.go +++ b/iSolarCloud/AppService/getTemplateList/struct.go @@ -5,9 +5,9 @@ package getTemplateList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUUIDByUpuuid/data.go b/iSolarCloud/AppService/getUUIDByUpuuid/data.go index 1eda26003..0b020c8e4 100644 --- a/iSolarCloud/AppService/getUUIDByUpuuid/data.go +++ b/iSolarCloud/AppService/getUUIDByUpuuid/data.go @@ -1,11 +1,12 @@ package getUUIDByUpuuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getUUIDByUpuuid" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUUIDByUpuuid/struct.go b/iSolarCloud/AppService/getUUIDByUpuuid/struct.go index b8b9b77ec..d5f129687 100644 --- a/iSolarCloud/AppService/getUUIDByUpuuid/struct.go +++ b/iSolarCloud/AppService/getUUIDByUpuuid/struct.go @@ -5,9 +5,9 @@ package getUUIDByUpuuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUpTimePoint/data.go b/iSolarCloud/AppService/getUpTimePoint/data.go index 86095c632..84d066743 100644 --- a/iSolarCloud/AppService/getUpTimePoint/data.go +++ b/iSolarCloud/AppService/getUpTimePoint/data.go @@ -1,10 +1,11 @@ package getUpTimePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -32,8 +33,8 @@ type ResultData struct { PointList []struct { PointId valueTypes.Integer `json:"point_id"` TimeType valueTypes.Integer `json:"time_type"` - } `json:"point_list" DataTable:"true"` // DataTablePivot:"true"` - } `json:"point_time_relation"` // DataTable:"true"` + } `json:"point_list" DataTable:"true"` // DataTablePivot:"true"` + } `json:"point_time_relation"` // DataTable:"true"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getUpTimePoint/struct.go b/iSolarCloud/AppService/getUpTimePoint/struct.go index 3f6e7445b..4ca554079 100644 --- a/iSolarCloud/AppService/getUpTimePoint/struct.go +++ b/iSolarCloud/AppService/getUpTimePoint/struct.go @@ -5,9 +5,9 @@ package getUpTimePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserById/data.go b/iSolarCloud/AppService/getUserById/data.go index 809a6c47c..1909a6510 100644 --- a/iSolarCloud/AppService/getUserById/data.go +++ b/iSolarCloud/AppService/getUserById/data.go @@ -1,11 +1,12 @@ package getUserById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserById/struct.go b/iSolarCloud/AppService/getUserById/struct.go index f75f91e90..d561b47fc 100644 --- a/iSolarCloud/AppService/getUserById/struct.go +++ b/iSolarCloud/AppService/getUserById/struct.go @@ -5,9 +5,9 @@ package getUserById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserByInstaller/data.go b/iSolarCloud/AppService/getUserByInstaller/data.go index 71d7d97e7..536e9d8d5 100644 --- a/iSolarCloud/AppService/getUserByInstaller/data.go +++ b/iSolarCloud/AppService/getUserByInstaller/data.go @@ -1,11 +1,12 @@ package getUserByInstaller import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserByInstaller" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserByInstaller/struct.go b/iSolarCloud/AppService/getUserByInstaller/struct.go index 1e4376ca0..37fae1539 100644 --- a/iSolarCloud/AppService/getUserByInstaller/struct.go +++ b/iSolarCloud/AppService/getUserByInstaller/struct.go @@ -5,9 +5,9 @@ package getUserByInstaller import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go b/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go index 78293dbee..4b1ad9460 100644 --- a/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go +++ b/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go @@ -1,11 +1,12 @@ package getUserDevOnlineOffineCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getUserDevOnlineOffineCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go b/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go index e7d52d00c..0905c1660 100644 --- a/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go +++ b/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go @@ -5,9 +5,9 @@ package getUserDevOnlineOffineCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserGDPRAttrs/data.go b/iSolarCloud/AppService/getUserGDPRAttrs/data.go index e12b3c335..b6fe3dcc5 100644 --- a/iSolarCloud/AppService/getUserGDPRAttrs/data.go +++ b/iSolarCloud/AppService/getUserGDPRAttrs/data.go @@ -1,11 +1,12 @@ package getUserGDPRAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserGDPRAttrs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserGDPRAttrs/struct.go b/iSolarCloud/AppService/getUserGDPRAttrs/struct.go index 2b7b858d6..bd7eaae70 100644 --- a/iSolarCloud/AppService/getUserGDPRAttrs/struct.go +++ b/iSolarCloud/AppService/getUserGDPRAttrs/struct.go @@ -5,9 +5,9 @@ package getUserGDPRAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserHavePowerStationCount/data.go b/iSolarCloud/AppService/getUserHavePowerStationCount/data.go index 9f399e490..fe97aca15 100644 --- a/iSolarCloud/AppService/getUserHavePowerStationCount/data.go +++ b/iSolarCloud/AppService/getUserHavePowerStationCount/data.go @@ -1,11 +1,12 @@ package getUserHavePowerStationCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserHavePowerStationCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go b/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go index b590a0ba2..cb4dde2c0 100644 --- a/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go +++ b/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go @@ -5,9 +5,9 @@ package getUserHavePowerStationCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go b/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go index 83030a66c..8cc0c6191 100644 --- a/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go +++ b/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go @@ -1,11 +1,12 @@ package getUserInfoByUserAccounts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserInfoByUserAccounts" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go b/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go index a2ce2e726..ffeddfabe 100644 --- a/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go +++ b/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go @@ -5,9 +5,9 @@ package getUserInfoByUserAccounts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserList/data.go b/iSolarCloud/AppService/getUserList/data.go index ed9ecde99..ba9595bb7 100644 --- a/iSolarCloud/AppService/getUserList/data.go +++ b/iSolarCloud/AppService/getUserList/data.go @@ -1,11 +1,12 @@ package getUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserList" @@ -25,11 +26,11 @@ func (rd RequestData) Help() string { } type ResultData []struct { - Email string `json:"email"` - Mobletel interface{} `json:"mobletel"` - Useraccount string `json:"useraccount"` + Email string `json:"email"` + Mobletel interface{} `json:"mobletel"` + Useraccount string `json:"useraccount"` Userid valueTypes.Integer `json:"userid"` - Username string `json:"username"` + Username string `json:"username"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getUserList/struct.go b/iSolarCloud/AppService/getUserList/struct.go index 6aa4170e7..3bac5e65e 100644 --- a/iSolarCloud/AppService/getUserList/struct.go +++ b/iSolarCloud/AppService/getUserList/struct.go @@ -5,9 +5,9 @@ package getUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getUserPsOrderList/data.go b/iSolarCloud/AppService/getUserPsOrderList/data.go index f590e31fc..98a7e5993 100644 --- a/iSolarCloud/AppService/getUserPsOrderList/data.go +++ b/iSolarCloud/AppService/getUserPsOrderList/data.go @@ -1,11 +1,12 @@ package getUserPsOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getUserPsOrderList" @@ -25,13 +26,13 @@ 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" PointIdReplace:"true" PointArrayFlatten:"false"` - RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` - Size valueTypes.Integer `json:"size"` - StartIndex interface{} `json:"startIndex" PointId:"start_index"` - TotalPage interface{} `json:"totalPage" PointId:"total_page"` + CurPage valueTypes.Integer `json:"curPage" PointId:"cur_page"` + IsMore valueTypes.Bool `json:"isMore" PointId:"is_more"` + 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"` + TotalPage interface{} `json:"totalPage" PointId:"total_page"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/getUserPsOrderList/struct.go b/iSolarCloud/AppService/getUserPsOrderList/struct.go index 3a82348d2..9e060329e 100644 --- a/iSolarCloud/AppService/getUserPsOrderList/struct.go +++ b/iSolarCloud/AppService/getUserPsOrderList/struct.go @@ -5,9 +5,9 @@ package getUserPsOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getValFromHBase/data.go b/iSolarCloud/AppService/getValFromHBase/data.go index 0b6268b7f..b834ad644 100644 --- a/iSolarCloud/AppService/getValFromHBase/data.go +++ b/iSolarCloud/AppService/getValFromHBase/data.go @@ -1,11 +1,12 @@ package getValFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getValFromHBase" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getValFromHBase/struct.go b/iSolarCloud/AppService/getValFromHBase/struct.go index 06c8b721c..d7d9204ec 100644 --- a/iSolarCloud/AppService/getValFromHBase/struct.go +++ b/iSolarCloud/AppService/getValFromHBase/struct.go @@ -5,9 +5,9 @@ package getValFromHBase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getValidateCode/data.go b/iSolarCloud/AppService/getValidateCode/data.go index 8413f50df..8f1a0c9dc 100644 --- a/iSolarCloud/AppService/getValidateCode/data.go +++ b/iSolarCloud/AppService/getValidateCode/data.go @@ -1,11 +1,12 @@ package getValidateCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getValidateCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getValidateCode/struct.go b/iSolarCloud/AppService/getValidateCode/struct.go index bbd772842..3273f42ec 100644 --- a/iSolarCloud/AppService/getValidateCode/struct.go +++ b/iSolarCloud/AppService/getValidateCode/struct.go @@ -5,9 +5,9 @@ package getValidateCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getValidateCodeAtRegister/data.go b/iSolarCloud/AppService/getValidateCodeAtRegister/data.go index d13076d2b..ce222f2b9 100644 --- a/iSolarCloud/AppService/getValidateCodeAtRegister/data.go +++ b/iSolarCloud/AppService/getValidateCodeAtRegister/data.go @@ -1,11 +1,12 @@ package getValidateCodeAtRegister import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getValidateCodeAtRegister" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go b/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go index bfd8f1193..49ac8c526 100644 --- a/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go +++ b/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go @@ -5,9 +5,9 @@ package getValidateCodeAtRegister import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getWeatherInfo/data.go b/iSolarCloud/AppService/getWeatherInfo/data.go index 3e95b3cd9..176c541ce 100644 --- a/iSolarCloud/AppService/getWeatherInfo/data.go +++ b/iSolarCloud/AppService/getWeatherInfo/data.go @@ -1,11 +1,12 @@ package getWeatherInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getWeatherInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getWeatherInfo/struct.go b/iSolarCloud/AppService/getWeatherInfo/struct.go index df445bfa3..8bd8d9a09 100644 --- a/iSolarCloud/AppService/getWeatherInfo/struct.go +++ b/iSolarCloud/AppService/getWeatherInfo/struct.go @@ -5,9 +5,9 @@ package getWeatherInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getWechatPushConfig/data.go b/iSolarCloud/AppService/getWechatPushConfig/data.go index 866a1cfba..709cf6fbf 100644 --- a/iSolarCloud/AppService/getWechatPushConfig/data.go +++ b/iSolarCloud/AppService/getWechatPushConfig/data.go @@ -1,11 +1,12 @@ package getWechatPushConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getWechatPushConfig" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getWechatPushConfig/struct.go b/iSolarCloud/AppService/getWechatPushConfig/struct.go index eaf659d8f..1cc5e62a4 100644 --- a/iSolarCloud/AppService/getWechatPushConfig/struct.go +++ b/iSolarCloud/AppService/getWechatPushConfig/struct.go @@ -5,9 +5,9 @@ package getWechatPushConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/getWorkInfo/data.go b/iSolarCloud/AppService/getWorkInfo/data.go index 8b5dd59ab..ae8f8aed0 100644 --- a/iSolarCloud/AppService/getWorkInfo/data.go +++ b/iSolarCloud/AppService/getWorkInfo/data.go @@ -1,11 +1,12 @@ package getWorkInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getWorkInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/getWorkInfo/struct.go b/iSolarCloud/AppService/getWorkInfo/struct.go index 7ba39bda1..64b7a7473 100644 --- a/iSolarCloud/AppService/getWorkInfo/struct.go +++ b/iSolarCloud/AppService/getWorkInfo/struct.go @@ -5,9 +5,9 @@ package getWorkInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/groupStringCheck/data.go b/iSolarCloud/AppService/groupStringCheck/data.go index b58b81c9c..3075cd984 100644 --- a/iSolarCloud/AppService/groupStringCheck/data.go +++ b/iSolarCloud/AppService/groupStringCheck/data.go @@ -1,11 +1,12 @@ package groupStringCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/groupStringCheck" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/groupStringCheck/struct.go b/iSolarCloud/AppService/groupStringCheck/struct.go index 8be1b9ebc..65d55262a 100644 --- a/iSolarCloud/AppService/groupStringCheck/struct.go +++ b/iSolarCloud/AppService/groupStringCheck/struct.go @@ -5,9 +5,9 @@ package groupStringCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/handleDevByCommunicationSN/data.go b/iSolarCloud/AppService/handleDevByCommunicationSN/data.go index 88f85b64e..6b26e9dc2 100644 --- a/iSolarCloud/AppService/handleDevByCommunicationSN/data.go +++ b/iSolarCloud/AppService/handleDevByCommunicationSN/data.go @@ -1,11 +1,12 @@ package handleDevByCommunicationSN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/handleDevByCommunicationSN" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go b/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go index cd281a460..f9b58d6ac 100644 --- a/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go +++ b/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go @@ -5,9 +5,9 @@ package handleDevByCommunicationSN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/householdResetPassBySN/data.go b/iSolarCloud/AppService/householdResetPassBySN/data.go index f62680ac7..6876e819a 100644 --- a/iSolarCloud/AppService/householdResetPassBySN/data.go +++ b/iSolarCloud/AppService/householdResetPassBySN/data.go @@ -1,11 +1,12 @@ package householdResetPassBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/householdResetPassBySN" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/householdResetPassBySN/struct.go b/iSolarCloud/AppService/householdResetPassBySN/struct.go index 9e4dfe5a7..9280a2976 100644 --- a/iSolarCloud/AppService/householdResetPassBySN/struct.go +++ b/iSolarCloud/AppService/householdResetPassBySN/struct.go @@ -5,9 +5,9 @@ package householdResetPassBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/immediatePayment/data.go b/iSolarCloud/AppService/immediatePayment/data.go index cae251884..c3bec9d42 100644 --- a/iSolarCloud/AppService/immediatePayment/data.go +++ b/iSolarCloud/AppService/immediatePayment/data.go @@ -1,11 +1,12 @@ package immediatePayment import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/immediatePayment" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/immediatePayment/struct.go b/iSolarCloud/AppService/immediatePayment/struct.go index 4184fc4e6..c74b7f76c 100644 --- a/iSolarCloud/AppService/immediatePayment/struct.go +++ b/iSolarCloud/AppService/immediatePayment/struct.go @@ -5,9 +5,9 @@ package immediatePayment import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/importExcelData/data.go b/iSolarCloud/AppService/importExcelData/data.go index e33dc43ac..a82d1ab12 100644 --- a/iSolarCloud/AppService/importExcelData/data.go +++ b/iSolarCloud/AppService/importExcelData/data.go @@ -1,11 +1,12 @@ package importExcelData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/importExcelData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/importExcelData/struct.go b/iSolarCloud/AppService/importExcelData/struct.go index 140319703..987752746 100644 --- a/iSolarCloud/AppService/importExcelData/struct.go +++ b/iSolarCloud/AppService/importExcelData/struct.go @@ -5,9 +5,9 @@ package importExcelData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/incomeStatistics/data.go b/iSolarCloud/AppService/incomeStatistics/data.go index 83d225e35..7780bff0c 100644 --- a/iSolarCloud/AppService/incomeStatistics/data.go +++ b/iSolarCloud/AppService/incomeStatistics/data.go @@ -1,11 +1,12 @@ package incomeStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/incomeStatistics" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/incomeStatistics/struct.go b/iSolarCloud/AppService/incomeStatistics/struct.go index 25f68f5ae..cffdf8a54 100644 --- a/iSolarCloud/AppService/incomeStatistics/struct.go +++ b/iSolarCloud/AppService/incomeStatistics/struct.go @@ -5,9 +5,9 @@ package incomeStatistics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/informPush/data.go b/iSolarCloud/AppService/informPush/data.go index d4b4ea5d8..ed7649aa1 100644 --- a/iSolarCloud/AppService/informPush/data.go +++ b/iSolarCloud/AppService/informPush/data.go @@ -1,11 +1,12 @@ package informPush import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/messageService/informPush" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/informPush/struct.go b/iSolarCloud/AppService/informPush/struct.go index 13876b440..12117f89b 100644 --- a/iSolarCloud/AppService/informPush/struct.go +++ b/iSolarCloud/AppService/informPush/struct.go @@ -5,9 +5,9 @@ package informPush import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/insertEmgOrgInfo/data.go b/iSolarCloud/AppService/insertEmgOrgInfo/data.go index d974ff7ea..56abfe8ae 100644 --- a/iSolarCloud/AppService/insertEmgOrgInfo/data.go +++ b/iSolarCloud/AppService/insertEmgOrgInfo/data.go @@ -1,11 +1,12 @@ package insertEmgOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/insertEmgOrgInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/insertEmgOrgInfo/struct.go b/iSolarCloud/AppService/insertEmgOrgInfo/struct.go index 6c87a83e1..1f08db1e3 100644 --- a/iSolarCloud/AppService/insertEmgOrgInfo/struct.go +++ b/iSolarCloud/AppService/insertEmgOrgInfo/struct.go @@ -5,9 +5,9 @@ package insertEmgOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go index d0a571d3d..5cde130bf 100644 --- a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go +++ b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go @@ -1,11 +1,12 @@ package insightSynDeviceStructure2Cloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/insightSynDeviceStructure2Cloud" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go index 1a5ff2e0c..133436d46 100644 --- a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go +++ b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go @@ -5,9 +5,9 @@ package insightSynDeviceStructure2Cloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/intoDataToHbase/data.go b/iSolarCloud/AppService/intoDataToHbase/data.go index c2cbbb8d2..52ce56121 100644 --- a/iSolarCloud/AppService/intoDataToHbase/data.go +++ b/iSolarCloud/AppService/intoDataToHbase/data.go @@ -1,11 +1,12 @@ package intoDataToHbase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/intoDataToHbase" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/intoDataToHbase/struct.go b/iSolarCloud/AppService/intoDataToHbase/struct.go index f57aae716..eb86f4285 100644 --- a/iSolarCloud/AppService/intoDataToHbase/struct.go +++ b/iSolarCloud/AppService/intoDataToHbase/struct.go @@ -5,9 +5,9 @@ package intoDataToHbase import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/ipLocationQuery/data.go b/iSolarCloud/AppService/ipLocationQuery/data.go index 1f07a8ab9..0c7223381 100644 --- a/iSolarCloud/AppService/ipLocationQuery/data.go +++ b/iSolarCloud/AppService/ipLocationQuery/data.go @@ -1,11 +1,12 @@ package ipLocationQuery import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/ipLocationQuery" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/ipLocationQuery/struct.go b/iSolarCloud/AppService/ipLocationQuery/struct.go index c2c867011..61d5747f8 100644 --- a/iSolarCloud/AppService/ipLocationQuery/struct.go +++ b/iSolarCloud/AppService/ipLocationQuery/struct.go @@ -5,9 +5,9 @@ package ipLocationQuery import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/isHave2GSn/data.go b/iSolarCloud/AppService/isHave2GSn/data.go index f0e600e40..3984f93f9 100644 --- a/iSolarCloud/AppService/isHave2GSn/data.go +++ b/iSolarCloud/AppService/isHave2GSn/data.go @@ -1,11 +1,12 @@ package isHave2GSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/isHave2GSn" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/isHave2GSn/struct.go b/iSolarCloud/AppService/isHave2GSn/struct.go index 8ceb6a9db..e2eef249d 100644 --- a/iSolarCloud/AppService/isHave2GSn/struct.go +++ b/iSolarCloud/AppService/isHave2GSn/struct.go @@ -5,9 +5,9 @@ package isHave2GSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go index 00e068cd2..edc9cf5bb 100644 --- a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go +++ b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go @@ -1,11 +1,12 @@ package judgeDevIsHasInitSetTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/judgeDevIsHasInitSetTemplate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go index e3a1ebdc2..401efd749 100644 --- a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go +++ b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go @@ -5,9 +5,9 @@ package judgeDevIsHasInitSetTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/judgeIsSettingMan/data.go b/iSolarCloud/AppService/judgeIsSettingMan/data.go index 5b510ae8f..6f7f6b8e0 100644 --- a/iSolarCloud/AppService/judgeIsSettingMan/data.go +++ b/iSolarCloud/AppService/judgeIsSettingMan/data.go @@ -1,11 +1,12 @@ package judgeIsSettingMan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/judgeIsSettingMan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/judgeIsSettingMan/struct.go b/iSolarCloud/AppService/judgeIsSettingMan/struct.go index f33f17c41..65570d8ea 100644 --- a/iSolarCloud/AppService/judgeIsSettingMan/struct.go +++ b/iSolarCloud/AppService/judgeIsSettingMan/struct.go @@ -5,9 +5,9 @@ package judgeIsSettingMan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/listOssFiles/data.go b/iSolarCloud/AppService/listOssFiles/data.go index 23354e904..1a8043b85 100644 --- a/iSolarCloud/AppService/listOssFiles/data.go +++ b/iSolarCloud/AppService/listOssFiles/data.go @@ -1,11 +1,12 @@ package listOssFiles import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/listOssFiles/struct.go b/iSolarCloud/AppService/listOssFiles/struct.go index 03d15ca0c..646617bc3 100644 --- a/iSolarCloud/AppService/listOssFiles/struct.go +++ b/iSolarCloud/AppService/listOssFiles/struct.go @@ -5,9 +5,9 @@ package listOssFiles import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/loadAreaInfo/data.go b/iSolarCloud/AppService/loadAreaInfo/data.go index 23ebd30d5..0db2ee4f0 100644 --- a/iSolarCloud/AppService/loadAreaInfo/data.go +++ b/iSolarCloud/AppService/loadAreaInfo/data.go @@ -1,11 +1,12 @@ package loadAreaInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/loadAreaInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/loadAreaInfo/struct.go b/iSolarCloud/AppService/loadAreaInfo/struct.go index 791b52bed..b6bb6aecc 100644 --- a/iSolarCloud/AppService/loadAreaInfo/struct.go +++ b/iSolarCloud/AppService/loadAreaInfo/struct.go @@ -5,9 +5,9 @@ package loadAreaInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/loadPowerStation/data.go b/iSolarCloud/AppService/loadPowerStation/data.go index d9765b8a0..44a3fc761 100644 --- a/iSolarCloud/AppService/loadPowerStation/data.go +++ b/iSolarCloud/AppService/loadPowerStation/data.go @@ -1,11 +1,12 @@ package loadPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/loadPowerStation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/loadPowerStation/struct.go b/iSolarCloud/AppService/loadPowerStation/struct.go index ff640a1ba..d66d6a747 100644 --- a/iSolarCloud/AppService/loadPowerStation/struct.go +++ b/iSolarCloud/AppService/loadPowerStation/struct.go @@ -5,9 +5,9 @@ package loadPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/login/auth.go b/iSolarCloud/AppService/login/auth.go index 2ec7fc9ef..17dcd6b3f 100644 --- a/iSolarCloud/AppService/login/auth.go +++ b/iSolarCloud/AppService/login/auth.go @@ -1,13 +1,14 @@ package login import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const ( @@ -23,12 +24,12 @@ type SunGrowAuth struct { UserPassword string TokenFile string // Token string - Force bool + Force bool - lastLogin time.Time - newToken bool + lastLogin time.Time + newToken bool // retry int - err error + err error } func (a *SunGrowAuth) Verify() error { @@ -62,11 +63,11 @@ func (a *SunGrowAuth) Verify() error { func (e *EndPoint) Login(auth *SunGrowAuth) error { for range Only.Once { e.Auth = auth - e.Request.RequestData = RequestData { + e.Request.RequestData = RequestData{ UserAccount: valueTypes.SetStringValue(auth.UserAccount), UserPassword: valueTypes.SetStringValue(auth.UserPassword), } - e.Request.RequestCommon = api.RequestCommon { + e.Request.RequestCommon = api.RequestCommon{ Appkey: auth.AppKey, SysCode: "900", } @@ -83,7 +84,7 @@ func (e *EndPoint) Login(auth *SunGrowAuth) error { if auth.Force { e.SetCacheTimeout(time.Second) - e.SetTokenInvalid() // e.CacheFilename() + e.SetTokenInvalid() // e.CacheFilename() // e.RemoveCache } diff --git a/iSolarCloud/AppService/login/data.go b/iSolarCloud/AppService/login/data.go index 4ff248e00..823a10873 100644 --- a/iSolarCloud/AppService/login/data.go +++ b/iSolarCloud/AppService/login/data.go @@ -1,10 +1,11 @@ package login import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -34,106 +35,106 @@ type ResultData struct { Msg valueTypes.String `json:"msg"` RemainTimes valueTypes.String `json:"remain_times"` - AcceptOrderNum valueTypes.Integer `json:"accept_order_num"` - BackgroundColor valueTypes.Integer `json:"background_color"` - CountryId string `json:"countryid"` - CreateDate string `json:"createdate"` - CreateUserId string `json:"createuserid"` - CurrentOrderNum valueTypes.Integer `json:"current_order_num"` - DisableTime string `json:"disable_time"` - Email string `json:"email"` - EnglishName interface{} `json:"englishname"` - GcjLatitude valueTypes.Float `json:"gcj_latitude"` - GcjLongitude valueTypes.Float `json:"gcj_longitude"` - ImToken interface{} `json:"im_token"` - IsDST valueTypes.Bool `json:"isDST"` - IsAfsFlag valueTypes.Bool `json:"is_afs_flag"` - IsAgreeGdpr valueTypes.Bool `json:"is_agree_gdpr"` - IsAu valueTypes.Bool `json:"is_au"` - IsCanModifyUserAccount valueTypes.Bool `json:"is_can_modify_user_account"` - IsDisableMap valueTypes.Bool `json:"is_disable_map"` - IsGdpr valueTypes.Bool `json:"is_gdpr"` - IsHaveIm valueTypes.Bool `json:"is_have_im"` - IsNewVersion valueTypes.Bool `json:"is_new_version"` - IsOnline valueTypes.Bool `json:"is_online"` - IsOpenProtocol valueTypes.Bool `json:"is_open_protocol"` - IsReceiveNotice valueTypes.Bool `json:"is_receive_notice"` - IsSharePosition valueTypes.Bool `json:"is_share_position"` - IsUploadLocation valueTypes.Bool `json:"is_upload_location"` - IsUseSungrowBrand valueTypes.Bool `json:"is_use_sungrow_brand"` - IsValidMobileEmail valueTypes.Bool `json:"is_valid_mobile_email"` - Isdst valueTypes.Bool `json:"isdst"` - Jobs interface{} `json:"jobs"` - Language string `json:"language"` - LoginFirstDate valueTypes.DateTime `json:"loginFirstDate" PointNameDateFormat:"DateTimeLayout"` - LoginFirstDate2 valueTypes.DateTime `json:"loginFristDate" PointNameDateFormat:"DateTimeLayout"` - LoginLastDate valueTypes.DateTime `json:"loginLastDate" PointNameDateFormat:"DateTimeLayout"` - LoginLastIP string `json:"loginLastIp"` - LoginTimes valueTypes.Integer `json:"loginTimes"` - Logo interface{} `json:"logo"` - LogoHTTPSURL interface{} `json:"logo_https_url"` - MapType string `json:"map_type"` - MinDate valueTypes.DateTime `json:"min_date" PointNameDateFormat:"DateTimeLayout"` - MobileTel interface{} `json:"mobile_tel"` - OrgId string `json:"org_id"` - OrgName string `json:"org_name"` - OrgTimezone string `json:"org_timezone"` - PasswordIsSimple valueTypes.Integer `json:"password_is_simple"` - PhotoId interface{} `json:"photo_id"` - PhotoURL interface{} `json:"photo_url"` + AcceptOrderNum valueTypes.Integer `json:"accept_order_num"` + BackgroundColor valueTypes.Integer `json:"background_color"` + CountryId string `json:"countryid"` + CreateDate string `json:"createdate"` + CreateUserId string `json:"createuserid"` + CurrentOrderNum valueTypes.Integer `json:"current_order_num"` + DisableTime string `json:"disable_time"` + Email string `json:"email"` + EnglishName interface{} `json:"englishname"` + GcjLatitude valueTypes.Float `json:"gcj_latitude"` + GcjLongitude valueTypes.Float `json:"gcj_longitude"` + ImToken interface{} `json:"im_token"` + IsDST valueTypes.Bool `json:"isDST"` + IsAfsFlag valueTypes.Bool `json:"is_afs_flag"` + IsAgreeGdpr valueTypes.Bool `json:"is_agree_gdpr"` + IsAu valueTypes.Bool `json:"is_au"` + IsCanModifyUserAccount valueTypes.Bool `json:"is_can_modify_user_account"` + IsDisableMap valueTypes.Bool `json:"is_disable_map"` + IsGdpr valueTypes.Bool `json:"is_gdpr"` + IsHaveIm valueTypes.Bool `json:"is_have_im"` + IsNewVersion valueTypes.Bool `json:"is_new_version"` + IsOnline valueTypes.Bool `json:"is_online"` + IsOpenProtocol valueTypes.Bool `json:"is_open_protocol"` + IsReceiveNotice valueTypes.Bool `json:"is_receive_notice"` + IsSharePosition valueTypes.Bool `json:"is_share_position"` + IsUploadLocation valueTypes.Bool `json:"is_upload_location"` + IsUseSungrowBrand valueTypes.Bool `json:"is_use_sungrow_brand"` + IsValidMobileEmail valueTypes.Bool `json:"is_valid_mobile_email"` + Isdst valueTypes.Bool `json:"isdst"` + Jobs interface{} `json:"jobs"` + Language string `json:"language"` + LoginFirstDate valueTypes.DateTime `json:"loginFirstDate" PointNameDateFormat:"DateTimeLayout"` + LoginFirstDate2 valueTypes.DateTime `json:"loginFristDate" PointNameDateFormat:"DateTimeLayout"` + LoginLastDate valueTypes.DateTime `json:"loginLastDate" PointNameDateFormat:"DateTimeLayout"` + LoginLastIP string `json:"loginLastIp"` + LoginTimes valueTypes.Integer `json:"loginTimes"` + Logo interface{} `json:"logo"` + LogoHTTPSURL interface{} `json:"logo_https_url"` + MapType string `json:"map_type"` + MinDate valueTypes.DateTime `json:"min_date" PointNameDateFormat:"DateTimeLayout"` + MobileTel interface{} `json:"mobile_tel"` + OrgId string `json:"org_id"` + OrgName string `json:"org_name"` + OrgTimezone string `json:"org_timezone"` + PasswordIsSimple valueTypes.Integer `json:"password_is_simple"` + PhotoId interface{} `json:"photo_id"` + PhotoURL interface{} `json:"photo_url"` Privileges []struct { FatherId valueTypes.Integer `json:"father_id"` - IconURL interface{} `json:"icon_url"` + IconURL interface{} `json:"icon_url"` IsOpen valueTypes.Bool `json:"is_open"` IsThirdPlatform valueTypes.Bool `json:"is_third_platform"` - MenuCode string `json:"menu_code"` + MenuCode string `json:"menu_code"` MenuLevel valueTypes.Integer `json:"menu_level"` - MenuName string `json:"menu_name"` - MenuOrder interface{} `json:"menu_order"` - MenuType string `json:"menu_type"` - MenuURL string `json:"menu_url"` + MenuName string `json:"menu_name"` + MenuOrder interface{} `json:"menu_order"` + MenuType string `json:"menu_type"` + MenuURL string `json:"menu_url"` PrivilegeId valueTypes.Integer `json:"privilege_id"` RoleId valueTypes.Integer `json:"role_id"` - URLTarget string `json:"url_target"` - VueIcon interface{} `json:"vue_icon"` - VuePath interface{} `json:"vue_path"` + URLTarget string `json:"url_target"` + VueIcon interface{} `json:"vue_icon"` + VuePath interface{} `json:"vue_path"` } `json:"privileges" DataTable:"true"` - RoleId string `json:"role_id"` - SecondaryOrgIds []interface{} `json:"secondaryOrgIds"` - ServerTel string `json:"server_tel"` - ServiceVersion string `json:"service_version"` - Sex string `json:"sex"` - Stylename string `json:"stylename"` - TimeZone string `json:"timeZone"` - Timezone string `json:"timezone"` - Timezoneid string `json:"timezoneid"` - Toggleflag string `json:"toggleflag"` - Token string `json:"token"` - UnlockLaveMinute valueTypes.Integer `json:"unlock_lave_minute"` - UploadTime interface{} `json:"upload_time"` - UserAccount string `json:"user_account"` - UserAccountModifyCount valueTypes.Integer `json:"user_account_modify_count"` - UserAccountModifyRemainTimes valueTypes.Integer `json:"user_account_modify_remain_times"` - UserDealerOrgCode interface{} `json:"user_dealer_org_code"` - UserId string `json:"user_id"` - UserLevel string `json:"user_level"` - UserMasterOrgId string `json:"user_master_org_id"` - UserMasterOrgName string `json:"user_master_org_name"` - UserMasterOrgTimeZoneId string `json:"user_master_org_time_zone_id"` - UserMasterOrgTimeZoneName string `json:"user_master_org_time_zone_name"` - UserName string `json:"user_name"` - UserRoleIdList []string `json:"user_role_id_list" DataTable:"true"` - UserTelNationCode interface{} `json:"user_tel_nation_code"` - UserauthorURL []interface{} `json:"userauthorURL"` - Userauthorbutto []string `json:"userauthorbutto" DataTable:"true"` - Userdesc interface{} `json:"userdesc"` - Userpassword string `json:"userpassword"` - Validflag string `json:"validflag"` - Voice string `json:"voice"` - Welcometext string `json:"welcometext"` - Wgs84Latitude valueTypes.Float `json:"wgs84_latitude"` - Wgs84Longitude valueTypes.Float `json:"wgs84_longitude"` - WorkTel interface{} `json:"work_tel"` + RoleId string `json:"role_id"` + SecondaryOrgIds []interface{} `json:"secondaryOrgIds"` + ServerTel string `json:"server_tel"` + ServiceVersion string `json:"service_version"` + Sex string `json:"sex"` + Stylename string `json:"stylename"` + TimeZone string `json:"timeZone"` + Timezone string `json:"timezone"` + Timezoneid string `json:"timezoneid"` + Toggleflag string `json:"toggleflag"` + Token string `json:"token"` + UnlockLaveMinute valueTypes.Integer `json:"unlock_lave_minute"` + UploadTime interface{} `json:"upload_time"` + UserAccount string `json:"user_account"` + UserAccountModifyCount valueTypes.Integer `json:"user_account_modify_count"` + UserAccountModifyRemainTimes valueTypes.Integer `json:"user_account_modify_remain_times"` + UserDealerOrgCode interface{} `json:"user_dealer_org_code"` + UserId string `json:"user_id"` + UserLevel string `json:"user_level"` + UserMasterOrgId string `json:"user_master_org_id"` + UserMasterOrgName string `json:"user_master_org_name"` + UserMasterOrgTimeZoneId string `json:"user_master_org_time_zone_id"` + UserMasterOrgTimeZoneName string `json:"user_master_org_time_zone_name"` + UserName string `json:"user_name"` + UserRoleIdList []string `json:"user_role_id_list" DataTable:"true"` + UserTelNationCode interface{} `json:"user_tel_nation_code"` + UserauthorURL []interface{} `json:"userauthorURL"` + Userauthorbutto []string `json:"userauthorbutto" DataTable:"true"` + Userdesc interface{} `json:"userdesc"` + Userpassword string `json:"userpassword"` + Validflag string `json:"validflag"` + Voice string `json:"voice"` + Welcometext string `json:"welcometext"` + Wgs84Latitude valueTypes.Float `json:"wgs84_latitude"` + Wgs84Longitude valueTypes.Float `json:"wgs84_longitude"` + WorkTel interface{} `json:"work_tel"` } func (e *ResultData) IsValid() error { @@ -188,7 +189,6 @@ func (e *EndPoint) UserName() string { return e.Response.ResultData.UserName } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/login/struct.go b/iSolarCloud/AppService/login/struct.go index c949fa658..f31dd316f 100644 --- a/iSolarCloud/AppService/login/struct.go +++ b/iSolarCloud/AppService/login/struct.go @@ -5,9 +5,9 @@ package login import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -42,8 +41,8 @@ type Response struct { // Init - Used to initialize a new endpoint instance. Usually called from an area. func Init(apiRoot api.Web) EndPoint { - return EndPoint { - EndPointStruct: api.EndPointStruct { + return EndPoint{ + EndPointStruct: api.EndPointStruct{ ApiRoot: apiRoot, Area: api.GetArea(EndPoint{}), Name: api.GetName(EndPoint{}), @@ -52,22 +51,21 @@ func Init(apiRoot api.Web) EndPoint { Response: Response{}, Error: nil, }, - Auth: &SunGrowAuth { + Auth: &SunGrowAuth{ AppKey: "", UserAccount: "", UserPassword: "", TokenFile: DefaultAuthTokenFile, // Token: "", - Force: false, - lastLogin: time.Time{}, - newToken: false, + Force: false, + lastLogin: time.Time{}, + newToken: false, // retry: 0, - err: nil, + err: nil, }, } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -89,18 +87,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -181,7 +180,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -255,7 +253,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -311,7 +308,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -335,7 +331,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -375,7 +370,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -407,4 +401,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/loginByToken/data.go b/iSolarCloud/AppService/loginByToken/data.go index 35e88ea5f..65fa0c607 100644 --- a/iSolarCloud/AppService/loginByToken/data.go +++ b/iSolarCloud/AppService/loginByToken/data.go @@ -1,11 +1,12 @@ package loginByToken import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/loginByToken" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/loginByToken/struct.go b/iSolarCloud/AppService/loginByToken/struct.go index 78decdb44..e59b74339 100644 --- a/iSolarCloud/AppService/loginByToken/struct.go +++ b/iSolarCloud/AppService/loginByToken/struct.go @@ -5,9 +5,9 @@ package loginByToken import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/logout/data.go b/iSolarCloud/AppService/logout/data.go index 5acfb110c..e75182072 100644 --- a/iSolarCloud/AppService/logout/data.go +++ b/iSolarCloud/AppService/logout/data.go @@ -1,11 +1,12 @@ package logout import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/logout" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/logout/struct.go b/iSolarCloud/AppService/logout/struct.go index 7eb588b5f..6f581953a 100644 --- a/iSolarCloud/AppService/logout/struct.go +++ b/iSolarCloud/AppService/logout/struct.go @@ -5,9 +5,9 @@ package logout import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/mobilePhoneHasBound/data.go b/iSolarCloud/AppService/mobilePhoneHasBound/data.go index 199e24a9f..599336402 100644 --- a/iSolarCloud/AppService/mobilePhoneHasBound/data.go +++ b/iSolarCloud/AppService/mobilePhoneHasBound/data.go @@ -1,11 +1,12 @@ package mobilePhoneHasBound import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/mobilePhoneHasBound" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/mobilePhoneHasBound/struct.go b/iSolarCloud/AppService/mobilePhoneHasBound/struct.go index c55623493..0655af5c0 100644 --- a/iSolarCloud/AppService/mobilePhoneHasBound/struct.go +++ b/iSolarCloud/AppService/mobilePhoneHasBound/struct.go @@ -5,9 +5,9 @@ package mobilePhoneHasBound import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifiedDeviceInfo/data.go b/iSolarCloud/AppService/modifiedDeviceInfo/data.go index 66b187bb0..1a2d66efd 100644 --- a/iSolarCloud/AppService/modifiedDeviceInfo/data.go +++ b/iSolarCloud/AppService/modifiedDeviceInfo/data.go @@ -1,11 +1,12 @@ package modifiedDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/modifiedDeviceInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifiedDeviceInfo/struct.go b/iSolarCloud/AppService/modifiedDeviceInfo/struct.go index 211849043..27f70322d 100644 --- a/iSolarCloud/AppService/modifiedDeviceInfo/struct.go +++ b/iSolarCloud/AppService/modifiedDeviceInfo/struct.go @@ -5,9 +5,9 @@ package modifiedDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyEmgOrgStruc/data.go b/iSolarCloud/AppService/modifyEmgOrgStruc/data.go index 8d75af2f8..795e36484 100644 --- a/iSolarCloud/AppService/modifyEmgOrgStruc/data.go +++ b/iSolarCloud/AppService/modifyEmgOrgStruc/data.go @@ -1,11 +1,12 @@ package modifyEmgOrgStruc import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/modifyEmgOrgStruc" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go b/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go index bf7d15302..be0e10ad5 100644 --- a/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go +++ b/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go @@ -5,9 +5,9 @@ package modifyEmgOrgStruc import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyFaultPlan/data.go b/iSolarCloud/AppService/modifyFaultPlan/data.go index 6ecc8a007..ebb71b0eb 100644 --- a/iSolarCloud/AppService/modifyFaultPlan/data.go +++ b/iSolarCloud/AppService/modifyFaultPlan/data.go @@ -1,11 +1,12 @@ package modifyFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/modifyFaultPlan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyFaultPlan/struct.go b/iSolarCloud/AppService/modifyFaultPlan/struct.go index 7d735d964..2eb881330 100644 --- a/iSolarCloud/AppService/modifyFaultPlan/struct.go +++ b/iSolarCloud/AppService/modifyFaultPlan/struct.go @@ -5,9 +5,9 @@ package modifyFaultPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyOnDutyInfo/data.go b/iSolarCloud/AppService/modifyOnDutyInfo/data.go index c0ea37276..c00dab0af 100644 --- a/iSolarCloud/AppService/modifyOnDutyInfo/data.go +++ b/iSolarCloud/AppService/modifyOnDutyInfo/data.go @@ -1,11 +1,12 @@ package modifyOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/modifyOnDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyOnDutyInfo/struct.go b/iSolarCloud/AppService/modifyOnDutyInfo/struct.go index f5397522c..3c3d6fff1 100644 --- a/iSolarCloud/AppService/modifyOnDutyInfo/struct.go +++ b/iSolarCloud/AppService/modifyOnDutyInfo/struct.go @@ -5,9 +5,9 @@ package modifyOnDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyPassword/data.go b/iSolarCloud/AppService/modifyPassword/data.go index cc095fc5a..cae6913fb 100644 --- a/iSolarCloud/AppService/modifyPassword/data.go +++ b/iSolarCloud/AppService/modifyPassword/data.go @@ -1,11 +1,12 @@ package modifyPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifyPassword" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyPassword/struct.go b/iSolarCloud/AppService/modifyPassword/struct.go index b1e7f1121..40f2a4dc3 100644 --- a/iSolarCloud/AppService/modifyPassword/struct.go +++ b/iSolarCloud/AppService/modifyPassword/struct.go @@ -5,9 +5,9 @@ package modifyPassword import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyPersonalUnitList/data.go b/iSolarCloud/AppService/modifyPersonalUnitList/data.go index 793843d07..a4d71175e 100644 --- a/iSolarCloud/AppService/modifyPersonalUnitList/data.go +++ b/iSolarCloud/AppService/modifyPersonalUnitList/data.go @@ -1,11 +1,12 @@ package modifyPersonalUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifyPersonalUnitList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyPersonalUnitList/struct.go b/iSolarCloud/AppService/modifyPersonalUnitList/struct.go index 50cb01ec3..2021e775d 100644 --- a/iSolarCloud/AppService/modifyPersonalUnitList/struct.go +++ b/iSolarCloud/AppService/modifyPersonalUnitList/struct.go @@ -5,9 +5,9 @@ package modifyPersonalUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/modifyPsUser/data.go b/iSolarCloud/AppService/modifyPsUser/data.go index 40415b5c4..321effbb0 100644 --- a/iSolarCloud/AppService/modifyPsUser/data.go +++ b/iSolarCloud/AppService/modifyPsUser/data.go @@ -1,11 +1,12 @@ package modifyPsUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifyPsUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/modifyPsUser/struct.go b/iSolarCloud/AppService/modifyPsUser/struct.go index cf3911a8c..74a0acae5 100644 --- a/iSolarCloud/AppService/modifyPsUser/struct.go +++ b/iSolarCloud/AppService/modifyPsUser/struct.go @@ -5,9 +5,9 @@ package modifyPsUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/moduleLogParamSet/data.go b/iSolarCloud/AppService/moduleLogParamSet/data.go index ff3d3f127..3b85a40af 100644 --- a/iSolarCloud/AppService/moduleLogParamSet/data.go +++ b/iSolarCloud/AppService/moduleLogParamSet/data.go @@ -1,11 +1,12 @@ package moduleLogParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/integrationService/moduleLogParamSet" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/moduleLogParamSet/struct.go b/iSolarCloud/AppService/moduleLogParamSet/struct.go index 2f00a986f..42c1b4417 100644 --- a/iSolarCloud/AppService/moduleLogParamSet/struct.go +++ b/iSolarCloud/AppService/moduleLogParamSet/struct.go @@ -5,9 +5,9 @@ package moduleLogParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/operateOssFile/data.go b/iSolarCloud/AppService/operateOssFile/data.go index 1efa84614..09d10d670 100644 --- a/iSolarCloud/AppService/operateOssFile/data.go +++ b/iSolarCloud/AppService/operateOssFile/data.go @@ -1,11 +1,12 @@ package operateOssFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/operateOssFile" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/operateOssFile/struct.go b/iSolarCloud/AppService/operateOssFile/struct.go index 7c86d3003..4ec0c1c8b 100644 --- a/iSolarCloud/AppService/operateOssFile/struct.go +++ b/iSolarCloud/AppService/operateOssFile/struct.go @@ -5,9 +5,9 @@ package operateOssFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go index db4644486..3d3e063c6 100644 --- a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go +++ b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go @@ -1,11 +1,12 @@ package operationPowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/operationPowerRobotSweepStrategy" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go index a49cd6973..94283fa89 100644 --- a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go +++ b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go @@ -5,9 +5,9 @@ package operationPowerRobotSweepStrategy import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/orgPowerReport/data.go b/iSolarCloud/AppService/orgPowerReport/data.go index d4a512966..8a94a7573 100644 --- a/iSolarCloud/AppService/orgPowerReport/data.go +++ b/iSolarCloud/AppService/orgPowerReport/data.go @@ -1,11 +1,12 @@ package orgPowerReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/orgPowerReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/orgPowerReport/struct.go b/iSolarCloud/AppService/orgPowerReport/struct.go index aa85a8160..6f7b5fdef 100644 --- a/iSolarCloud/AppService/orgPowerReport/struct.go +++ b/iSolarCloud/AppService/orgPowerReport/struct.go @@ -5,9 +5,9 @@ package orgPowerReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/paramSetTryAgain/data.go b/iSolarCloud/AppService/paramSetTryAgain/data.go index 7f611beb8..815e08bea 100644 --- a/iSolarCloud/AppService/paramSetTryAgain/data.go +++ b/iSolarCloud/AppService/paramSetTryAgain/data.go @@ -1,11 +1,12 @@ package paramSetTryAgain import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/paramSetTryAgain" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/paramSetTryAgain/struct.go b/iSolarCloud/AppService/paramSetTryAgain/struct.go index d08bdf2f8..8a4337a4e 100644 --- a/iSolarCloud/AppService/paramSetTryAgain/struct.go +++ b/iSolarCloud/AppService/paramSetTryAgain/struct.go @@ -5,9 +5,9 @@ package paramSetTryAgain import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/paramSetting/data.go b/iSolarCloud/AppService/paramSetting/data.go index 56f974ff8..3d2f9d54e 100644 --- a/iSolarCloud/AppService/paramSetting/data.go +++ b/iSolarCloud/AppService/paramSetting/data.go @@ -1,11 +1,12 @@ package paramSetting import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/paramSetting" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/paramSetting/struct.go b/iSolarCloud/AppService/paramSetting/struct.go index 880f19256..66699e182 100644 --- a/iSolarCloud/AppService/paramSetting/struct.go +++ b/iSolarCloud/AppService/paramSetting/struct.go @@ -5,9 +5,9 @@ package paramSetting import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/planPower/data.go b/iSolarCloud/AppService/planPower/data.go index 2af551057..649a4dae4 100644 --- a/iSolarCloud/AppService/planPower/data.go +++ b/iSolarCloud/AppService/planPower/data.go @@ -1,11 +1,12 @@ package planPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/planPower" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/planPower/struct.go b/iSolarCloud/AppService/planPower/struct.go index b713f503a..cf18bf566 100644 --- a/iSolarCloud/AppService/planPower/struct.go +++ b/iSolarCloud/AppService/planPower/struct.go @@ -5,9 +5,9 @@ package planPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/powerDevicePointList/data.go b/iSolarCloud/AppService/powerDevicePointList/data.go index d2d346042..7d2e124f4 100644 --- a/iSolarCloud/AppService/powerDevicePointList/data.go +++ b/iSolarCloud/AppService/powerDevicePointList/data.go @@ -1,10 +1,11 @@ package powerDevicePointList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/reportService/powerDevicePointList" diff --git a/iSolarCloud/AppService/powerDevicePointList/struct.go b/iSolarCloud/AppService/powerDevicePointList/struct.go index c893a602d..b16940ca2 100644 --- a/iSolarCloud/AppService/powerDevicePointList/struct.go +++ b/iSolarCloud/AppService/powerDevicePointList/struct.go @@ -5,9 +5,9 @@ package powerDevicePointList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/powerTrendChartData/data.go b/iSolarCloud/AppService/powerTrendChartData/data.go index e92d81027..d826e01cb 100644 --- a/iSolarCloud/AppService/powerTrendChartData/data.go +++ b/iSolarCloud/AppService/powerTrendChartData/data.go @@ -1,11 +1,12 @@ package powerTrendChartData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/powerTrendChartData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/powerTrendChartData/struct.go b/iSolarCloud/AppService/powerTrendChartData/struct.go index 2c7821ded..0c0ebf360 100644 --- a/iSolarCloud/AppService/powerTrendChartData/struct.go +++ b/iSolarCloud/AppService/powerTrendChartData/struct.go @@ -5,9 +5,9 @@ package powerTrendChartData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/psForcastInfo/data.go b/iSolarCloud/AppService/psForcastInfo/data.go index d3e15fecd..032869a92 100644 --- a/iSolarCloud/AppService/psForcastInfo/data.go +++ b/iSolarCloud/AppService/psForcastInfo/data.go @@ -1,12 +1,12 @@ package psForcastInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" +) const Url = "/v1/powerStationService/psForcastInfo" const Disabled = false @@ -25,43 +25,42 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { AreaForecastList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"DateTime"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"DateTime"` - DateTime valueTypes.DateTime `json:"date_time" PointNameDateFormat:"DateTimeLayout"` + DateTime valueTypes.DateTime `json:"date_time" PointNameDateFormat:"DateTimeLayout"` - City valueTypes.String `json:"city"` - Chill valueTypes.Float `json:"chill"` - Code valueTypes.Integer `json:"code"` - CodeName valueTypes.String `json:"code_name"` - Direction valueTypes.Float `json:"direction"` - HighF valueTypes.Float `json:"high" PointUnit:"F"` - HighC valueTypes.Float `json:"highc" PointUnit:"C"` - Humidity valueTypes.Float `json:"humidity"` - LowF valueTypes.Float `json:"low" PointUnit:"F"` - LowC valueTypes.Float `json:"lowc" PointUnit:"C"` - Pressure valueTypes.Float `json:"pressure" PointUnit:"hPa"` - Rising valueTypes.Bool `json:"rising"` + City valueTypes.String `json:"city"` + Chill valueTypes.Float `json:"chill"` + Code valueTypes.Integer `json:"code"` + CodeName valueTypes.String `json:"code_name"` + Direction valueTypes.Float `json:"direction"` + HighF valueTypes.Float `json:"high" PointUnit:"F"` + HighC valueTypes.Float `json:"highc" PointUnit:"C"` + Humidity valueTypes.Float `json:"humidity"` + LowF valueTypes.Float `json:"low" PointUnit:"F"` + LowC valueTypes.Float `json:"lowc" PointUnit:"C"` + Pressure valueTypes.Float `json:"pressure" PointUnit:"hPa"` + Rising valueTypes.Bool `json:"rising"` - Speed valueTypes.Float `json:"speed" PointUnitFrom:"SpeedUnit"` - SpeedUnit valueTypes.String `json:"speed_unit"` + Speed valueTypes.Float `json:"speed" PointUnitFrom:"SpeedUnit"` + SpeedUnit valueTypes.String `json:"speed_unit"` - SpeedOriginal valueTypes.Float `json:"speed_original" PointUnitFrom:"SpeedOriginalUnit"` - SpeedOriginalUnit valueTypes.String `json:"speed_original_unit" PointIgnore:"true"` + SpeedOriginal valueTypes.Float `json:"speed_original" PointUnitFrom:"SpeedOriginalUnit"` + SpeedOriginalUnit valueTypes.String `json:"speed_original_unit" PointIgnore:"true"` - Sunrise valueTypes.Time `json:"sunrise"` - Sunset valueTypes.Time `json:"sunset"` - Visibility valueTypes.Float `json:"visibility"` - WeatherDesc valueTypes.String `json:"weather_desc"` - WeatherURL valueTypes.String `json:"weather_url"` - PsKnowledge valueTypes.String `json:"ps_knowledge"` + Sunrise valueTypes.Time `json:"sunrise"` + Sunset valueTypes.Time `json:"sunset"` + Visibility valueTypes.Float `json:"visibility"` + WeatherDesc valueTypes.String `json:"weather_desc"` + WeatherURL valueTypes.String `json:"weather_url"` + PsKnowledge valueTypes.String `json:"ps_knowledge"` } `json:"areaForcastList" PointId:"area_forcast_list" DataTable:"true"` StationsCityCode []struct { - PsId valueTypes.PsId `json:"ps_id"` - PsName valueTypes.String `json:"ps_name"` - City valueTypes.String `json:"city"` + PsId valueTypes.PsId `json:"ps_id"` + PsName valueTypes.String `json:"ps_name"` + City valueTypes.String `json:"city"` } `json:"stationsCityCode" PointId:"stations_city_code" DataTable:"true"` } diff --git a/iSolarCloud/AppService/psForcastInfo/struct.go b/iSolarCloud/AppService/psForcastInfo/struct.go index b85617ad5..704bf87b2 100644 --- a/iSolarCloud/AppService/psForcastInfo/struct.go +++ b/iSolarCloud/AppService/psForcastInfo/struct.go @@ -5,9 +5,9 @@ package psForcastInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -346,7 +341,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -378,4 +372,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/psHourPointsValue/data.go b/iSolarCloud/AppService/psHourPointsValue/data.go index 8ff3d8824..5c45dbfb5 100644 --- a/iSolarCloud/AppService/psHourPointsValue/data.go +++ b/iSolarCloud/AppService/psHourPointsValue/data.go @@ -1,10 +1,11 @@ package psHourPointsValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/psHourPointsValue" @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData struct { - GoStructParent GoStruct.GoStructParent `json:"-" PointIdReplace:"true" DataTable:"true" DataTableIndex:"true" DataTableIndexTitle:"Hour"` // DataTablePivot:"true"` + GoStructParent GoStruct.GoStructParent `json:"-" PointIdReplace:"true" DataTable:"true" DataTableIndex:"true" DataTableIndexTitle:"Hour"` // DataTablePivot:"true"` P24001List []valueTypes.Float `json:"p24001List" PointId:"p24001" PointUnitFrom:"P24001Unit"` P24001Unit valueTypes.String `json:"p24001_unit" PointIgnore:"true"` diff --git a/iSolarCloud/AppService/psHourPointsValue/struct.go b/iSolarCloud/AppService/psHourPointsValue/struct.go index cebc7c53d..a37527fa1 100644 --- a/iSolarCloud/AppService/psHourPointsValue/struct.go +++ b/iSolarCloud/AppService/psHourPointsValue/struct.go @@ -5,9 +5,9 @@ package psHourPointsValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryAllPsIdAndName/data.go b/iSolarCloud/AppService/queryAllPsIdAndName/data.go index d3e4053d8..ecdc700a8 100644 --- a/iSolarCloud/AppService/queryAllPsIdAndName/data.go +++ b/iSolarCloud/AppService/queryAllPsIdAndName/data.go @@ -1,10 +1,11 @@ package queryAllPsIdAndName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/queryAllPsIdAndName" @@ -27,8 +28,8 @@ type ResultData struct { PageList []struct { GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"PsId"` - PsId valueTypes.PsId `json:"ps_id"` - PsName valueTypes.String `json:"ps_name"` + PsId valueTypes.PsId `json:"ps_id"` + PsName valueTypes.String `json:"ps_name"` } `json:"pageList" PointId:"page_list" DataTable:"true"` } diff --git a/iSolarCloud/AppService/queryAllPsIdAndName/struct.go b/iSolarCloud/AppService/queryAllPsIdAndName/struct.go index d4dcc8fd3..3f1f58e58 100644 --- a/iSolarCloud/AppService/queryAllPsIdAndName/struct.go +++ b/iSolarCloud/AppService/queryAllPsIdAndName/struct.go @@ -5,9 +5,9 @@ package queryAllPsIdAndName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go b/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go index 3502149f7..64e54db1f 100644 --- a/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go +++ b/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go @@ -1,9 +1,10 @@ package queryBatchCreatePsTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go b/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go index 8b76df00f..edf093e79 100644 --- a/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go +++ b/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go @@ -5,9 +5,9 @@ package queryBatchCreatePsTaskList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go index a82cd8d59..b4e3215cb 100644 --- a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go +++ b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go @@ -1,11 +1,12 @@ package queryBatchSpeedyAddPowerStationResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryBatchSpeedyAddPowerStationResult" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go index ccf0c1ebc..c2f97080b 100644 --- a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go +++ b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go @@ -5,9 +5,9 @@ package queryBatchSpeedyAddPowerStationResult import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCardStatusCTCC/data.go b/iSolarCloud/AppService/queryCardStatusCTCC/data.go index 52df2c1f3..d411a20c1 100644 --- a/iSolarCloud/AppService/queryCardStatusCTCC/data.go +++ b/iSolarCloud/AppService/queryCardStatusCTCC/data.go @@ -1,11 +1,12 @@ package queryCardStatusCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryCardStatusCTCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryCardStatusCTCC/struct.go b/iSolarCloud/AppService/queryCardStatusCTCC/struct.go index 7882e686d..e030fa082 100644 --- a/iSolarCloud/AppService/queryCardStatusCTCC/struct.go +++ b/iSolarCloud/AppService/queryCardStatusCTCC/struct.go @@ -5,9 +5,9 @@ package queryCardStatusCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryChildAccountList/data.go b/iSolarCloud/AppService/queryChildAccountList/data.go index 82a4b1b03..9150f7d8c 100644 --- a/iSolarCloud/AppService/queryChildAccountList/data.go +++ b/iSolarCloud/AppService/queryChildAccountList/data.go @@ -1,11 +1,12 @@ package queryChildAccountList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryChildAccountList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryChildAccountList/struct.go b/iSolarCloud/AppService/queryChildAccountList/struct.go index ba1afb22c..9bceb3e51 100644 --- a/iSolarCloud/AppService/queryChildAccountList/struct.go +++ b/iSolarCloud/AppService/queryChildAccountList/struct.go @@ -5,9 +5,9 @@ package queryChildAccountList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCompensationRecordData/data.go b/iSolarCloud/AppService/queryCompensationRecordData/data.go index 3a5206ca7..d0647e924 100644 --- a/iSolarCloud/AppService/queryCompensationRecordData/data.go +++ b/iSolarCloud/AppService/queryCompensationRecordData/data.go @@ -1,11 +1,12 @@ package queryCompensationRecordData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryCompensationRecordData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryCompensationRecordData/struct.go b/iSolarCloud/AppService/queryCompensationRecordData/struct.go index 92b7c0928..71bd88912 100644 --- a/iSolarCloud/AppService/queryCompensationRecordData/struct.go +++ b/iSolarCloud/AppService/queryCompensationRecordData/struct.go @@ -5,9 +5,9 @@ package queryCompensationRecordData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCompensationRecordList/data.go b/iSolarCloud/AppService/queryCompensationRecordList/data.go index 7544f2a0c..1b663665c 100644 --- a/iSolarCloud/AppService/queryCompensationRecordList/data.go +++ b/iSolarCloud/AppService/queryCompensationRecordList/data.go @@ -1,11 +1,12 @@ package queryCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryCompensationRecordList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryCompensationRecordList/struct.go b/iSolarCloud/AppService/queryCompensationRecordList/struct.go index 9ee1f8bfc..04bfae6e4 100644 --- a/iSolarCloud/AppService/queryCompensationRecordList/struct.go +++ b/iSolarCloud/AppService/queryCompensationRecordList/struct.go @@ -5,9 +5,9 @@ package queryCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryComponent/data.go b/iSolarCloud/AppService/queryComponent/data.go index f78052625..427ef84bd 100644 --- a/iSolarCloud/AppService/queryComponent/data.go +++ b/iSolarCloud/AppService/queryComponent/data.go @@ -1,11 +1,12 @@ package queryComponent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryComponent" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryComponent/struct.go b/iSolarCloud/AppService/queryComponent/struct.go index 1c90972da..dcf2b27b2 100644 --- a/iSolarCloud/AppService/queryComponent/struct.go +++ b/iSolarCloud/AppService/queryComponent/struct.go @@ -5,9 +5,9 @@ package queryComponent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryComponentTechnicalParam/data.go b/iSolarCloud/AppService/queryComponentTechnicalParam/data.go index 23f63c492..ca7ef609f 100644 --- a/iSolarCloud/AppService/queryComponentTechnicalParam/data.go +++ b/iSolarCloud/AppService/queryComponentTechnicalParam/data.go @@ -1,11 +1,12 @@ package queryComponentTechnicalParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryComponentTechnicalParam" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go b/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go index 0d703fc07..3f746aad3 100644 --- a/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go +++ b/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go @@ -5,9 +5,9 @@ package queryComponentTechnicalParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCountryGridAndRelation/data.go b/iSolarCloud/AppService/queryCountryGridAndRelation/data.go index c14b1a0ab..30f440c99 100644 --- a/iSolarCloud/AppService/queryCountryGridAndRelation/data.go +++ b/iSolarCloud/AppService/queryCountryGridAndRelation/data.go @@ -1,11 +1,12 @@ package queryCountryGridAndRelation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryCountryGridAndRelation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go b/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go index c8d862124..e6a42bfbb 100644 --- a/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go +++ b/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go @@ -5,9 +5,9 @@ package queryCountryGridAndRelation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCountryList/data.go b/iSolarCloud/AppService/queryCountryList/data.go index bb8460af8..c6d9595bc 100644 --- a/iSolarCloud/AppService/queryCountryList/data.go +++ b/iSolarCloud/AppService/queryCountryList/data.go @@ -1,11 +1,12 @@ package queryCountryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/queryCountryList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryCountryList/struct.go b/iSolarCloud/AppService/queryCountryList/struct.go index 9e89b7097..80684411b 100644 --- a/iSolarCloud/AppService/queryCountryList/struct.go +++ b/iSolarCloud/AppService/queryCountryList/struct.go @@ -5,9 +5,9 @@ package queryCountryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryCtrlTaskById/data.go b/iSolarCloud/AppService/queryCtrlTaskById/data.go index 605dcc4f4..d279b6d48 100644 --- a/iSolarCloud/AppService/queryCtrlTaskById/data.go +++ b/iSolarCloud/AppService/queryCtrlTaskById/data.go @@ -1,11 +1,12 @@ package queryCtrlTaskById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryCtrlTaskById" diff --git a/iSolarCloud/AppService/queryCtrlTaskById/struct.go b/iSolarCloud/AppService/queryCtrlTaskById/struct.go index 3ca389571..ee5094070 100644 --- a/iSolarCloud/AppService/queryCtrlTaskById/struct.go +++ b/iSolarCloud/AppService/queryCtrlTaskById/struct.go @@ -5,9 +5,9 @@ package queryCtrlTaskById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceInfo/data.go b/iSolarCloud/AppService/queryDeviceInfo/data.go index c6f808de0..045414b2d 100644 --- a/iSolarCloud/AppService/queryDeviceInfo/data.go +++ b/iSolarCloud/AppService/queryDeviceInfo/data.go @@ -1,10 +1,11 @@ package queryDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/queryDeviceInfo" @@ -44,11 +45,11 @@ type ResultData struct { UUID valueTypes.String `json:"uuid"` } `json:"devicePropertyValueList" PointId:"device_property_value_list" DataTable:"true"` - PsKey valueTypes.String `json:"ps_key"` - PsId valueTypes.PsId `json:"ps_id"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceCode valueTypes.Integer `json:"device_code"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + PsKey valueTypes.String `json:"ps_key"` + PsId valueTypes.PsId `json:"ps_id"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceCode valueTypes.Integer `json:"device_code"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` PsName valueTypes.String `json:"ps_name"` PsShortName valueTypes.String `json:"ps_short_name"` @@ -131,6 +132,6 @@ func (e *ResultData) IsValid() error { func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() - entries.StructToDataMap(*e, e.Response.ResultData.PsId.String(), GoStruct.NewEndPointPath(e.Response.ResultData.PsId.String())) + entries.StructToDataMap(*e, e.Response.ResultData.PsId.String(), GoStruct.NewEndPointPath(e.Response.ResultData.PsId.String())) return entries } diff --git a/iSolarCloud/AppService/queryDeviceInfo/struct.go b/iSolarCloud/AppService/queryDeviceInfo/struct.go index 4b33b87b3..2212ad9a5 100644 --- a/iSolarCloud/AppService/queryDeviceInfo/struct.go +++ b/iSolarCloud/AppService/queryDeviceInfo/struct.go @@ -5,9 +5,9 @@ package queryDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go index ea19093db..8ec762728 100644 --- a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go +++ b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go @@ -1,10 +1,11 @@ package queryDeviceInfoForApp import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/queryDeviceInfoForApp" @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { type ResultData struct { DeviceModelList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"ModelId" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"ModelId" PointIdReplace:"true"` ModelId valueTypes.Integer `json:"model_id"` DeviceModel valueTypes.String `json:"device_model"` @@ -47,11 +48,11 @@ type ResultData struct { CodeTypeName valueTypes.String `json:"code_type_name"` } `json:"subTypeList" PointId:"sub_type_list" PointArrayFlatten:"false" DataTable:"true"` - PsKey valueTypes.String `json:"ps_key"` - PsId valueTypes.PsId `json:"ps_id"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceCode valueTypes.Integer `json:"device_code"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + PsKey valueTypes.String `json:"ps_key"` + PsId valueTypes.PsId `json:"ps_id"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceCode valueTypes.Integer `json:"device_code"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` PsName valueTypes.String `json:"ps_name"` ArmVersion interface{} `json:"arm_version"` @@ -139,6 +140,6 @@ func (e *ResultData) IsValid() error { func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() - entries.StructToDataMap(*e, e.Response.ResultData.PsId.String(), GoStruct.NewEndPointPath(e.Response.ResultData.PsId.String())) + entries.StructToDataMap(*e, e.Response.ResultData.PsId.String(), GoStruct.NewEndPointPath(e.Response.ResultData.PsId.String())) return entries } diff --git a/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go b/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go index 5f4635821..d038ae29d 100644 --- a/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go +++ b/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go @@ -5,9 +5,9 @@ package queryDeviceInfoForApp import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceList/data.go b/iSolarCloud/AppService/queryDeviceList/data.go index 9eba0d88b..bd814a5d8 100644 --- a/iSolarCloud/AppService/queryDeviceList/data.go +++ b/iSolarCloud/AppService/queryDeviceList/data.go @@ -1,9 +1,9 @@ package queryDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -36,10 +36,11 @@ type ResultData struct { 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"` + DevTypeDefinition map[string]valueTypes.String `json:"dev_type_definition" PointId:"device_types" PointUpdateFreq:"UpdateFreqBoot"` // DataTable:"true"` RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } + // DevCountByTypeMap struct { // One4 valueTypes.Integer `json:"14"` // Two2 valueTypes.Integer `json:"22"` @@ -96,14 +97,14 @@ type ResultData struct { // } `json:"dev_type_definition"` type Device struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsKey" PointIdReplace:"true" PointDeviceFrom:"PsKey"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsKey" PointIdReplace:"true" PointDeviceFrom:"PsKey"` - PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"` - PsId valueTypes.PsId `json:"ps_id" PointId:"ps_id" PointUpdateFreq:"UpdateFreqBoot"` - DeviceType valueTypes.Integer `json:"device_type" PointId:"device_type" PointUpdateFreq:"UpdateFreqBoot"` - DeviceCode valueTypes.Integer `json:"device_code" PointId:"device_code" PointUpdateFreq:"UpdateFreqBoot"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id" PointUpdateFreq:"UpdateFreqBoot"` - Sn valueTypes.String `json:"sn" PointId:"sn" PointName:"Serial Number" PointUpdateFreq:"UpdateFreqBoot"` + PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"` + PsId valueTypes.PsId `json:"ps_id" PointId:"ps_id" PointUpdateFreq:"UpdateFreqBoot"` + DeviceType valueTypes.Integer `json:"device_type" PointId:"device_type" PointUpdateFreq:"UpdateFreqBoot"` + DeviceCode valueTypes.Integer `json:"device_code" PointId:"device_code" PointUpdateFreq:"UpdateFreqBoot"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id" PointUpdateFreq:"UpdateFreqBoot"` + Sn valueTypes.String `json:"sn" PointId:"sn" PointName:"Serial Number" PointUpdateFreq:"UpdateFreqBoot"` AlarmCount valueTypes.Count `json:"alarm_count" PointId:"alarm_count" PointUpdateFreq:"UpdateFreqTotal"` CommandStatus valueTypes.Integer `json:"command_status" PointId:"command_status" PointUpdateFreq:"UpdateFreqInstant"` @@ -141,29 +142,29 @@ type Device struct { 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 - PointData []PointStruct `json:"point_data" PointId:"data" PointIdReplace:"true" DataTable:"true"` // PointIdFromChild:"PointId" PointIdReplace:"true" PointId:"data" DataTable:"true"` - PsTimezoneInfo struct { + PointData []PointStruct `json:"point_data" PointId:"data" PointIdReplace:"true" DataTable:"true"` // PointIdFromChild:"PointId" PointIdReplace:"true" PointId:"data" DataTable:"true"` + PsTimezoneInfo struct { IsDst valueTypes.Bool `json:"is_dst" PointUpdateFreq:"UpdateFreqInstant"` TimeZone valueTypes.String `json:"time_zone" PointUpdateFreq:"UpdateFreqInstant"` - } `json:"psTimezoneInfo" PointId:"ps_timezone_info"` + } `json:"psTimezoneInfo" PointId:"ps_timezone_info"` } type PointStruct struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PointId" PointIdReplace:"true" PointTimestampFrom:"TimeStamp" PointDeviceFromParent:"PsKey"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PointId" PointIdReplace:"true" PointTimestampFrom:"TimeStamp" PointDeviceFromParent:"PsKey"` // GoStruct GoStruct.GoStruct `json:"-" PointDeviceFromParent:"PsKey"` - TimeStamp valueTypes.DateTime `json:"time_stamp" PointUpdateFreq:"UpdateFreq5Mins" PointNameDateFormat:"DateTimeLayout"` - PointId valueTypes.PointId `json:"point_id" PointUpdateFreq:"UpdateFreqBoot"` - PointName valueTypes.String `json:"point_name" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - Value valueTypes.Float `json:"value" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUnitFrom:"Unit" PointVariableUnit:"true" PointUpdateFreq:"UpdateFreq5Mins"` - PointSign valueTypes.String `json:"point_sign" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - Unit valueTypes.String `json:"unit" PointUpdateFreq:"UpdateFreqBoot"` - ValueDescription valueTypes.String `json:"value_description" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - OrderId valueTypes.Integer `json:"order_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - PointGroupId valueTypes.Integer `json:"point_group_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - PointGroupName valueTypes.String `json:"point_group_name" PointUpdateFreq:"UpdateFreqBoot"` - Relate valueTypes.Integer `json:"relate" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` - CodeId valueTypes.Integer `json:"code_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + TimeStamp valueTypes.DateTime `json:"time_stamp" PointUpdateFreq:"UpdateFreq5Mins" PointNameDateFormat:"DateTimeLayout"` + PointId valueTypes.PointId `json:"point_id" PointUpdateFreq:"UpdateFreqBoot"` + PointName valueTypes.String `json:"point_name" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + Value valueTypes.Float `json:"value" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUnitFrom:"Unit" PointVariableUnit:"true" PointUpdateFreq:"UpdateFreq5Mins"` + PointSign valueTypes.String `json:"point_sign" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + Unit valueTypes.String `json:"unit" PointUpdateFreq:"UpdateFreqBoot"` + ValueDescription valueTypes.String `json:"value_description" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + OrderId valueTypes.Integer `json:"order_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + PointGroupId valueTypes.Integer `json:"point_group_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + PointGroupName valueTypes.String `json:"point_group_name" PointUpdateFreq:"UpdateFreqBoot"` + Relate valueTypes.Integer `json:"relate" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` + CodeId valueTypes.Integer `json:"code_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` CodeIdOrderId valueTypes.String `json:"code_id_order_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` CodeName valueTypes.String `json:"code_name" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"` @@ -325,7 +326,6 @@ func (e *EndPoint) SetBatteryPoints(epp GoStruct.EndPointPath, entries api.DataM _ = entries.MakeState(batteryPowerActive) batteryPowerActive.DataStructure.PointUpdateFreq = GoStruct.UpdateFreq5Mins - // /////////////////////////////////////////////////////// // batteryDischargeEnergy := entries.CopyPointFromName(epp.AddString("p13029"), epp, "battery_discharge_energy", "Battery Discharge Energy (p13029)") // batteryDischargeEnergy.DataStructure.PointIcon = "mdi:battery" @@ -352,7 +352,6 @@ func (e *EndPoint) SetBatteryPoints(epp GoStruct.EndPointPath, entries api.DataM batteryChargeEnergyPercent.Value.SetUnit("%") // batteryChargeEnergyPercent.DataStructure.PointIcon = "mdi:battery" - // /////////////////////////////////////////////////////// // batteryToLoadPower := entries.CopyPoint(batteryDischargePower, epp, "battery_to_load_power", "Battery To Load Power (Calc)") // batteryToLoadPower.DataStructure.PointIcon = "mdi:battery" diff --git a/iSolarCloud/AppService/queryDeviceList/struct.go b/iSolarCloud/AppService/queryDeviceList/struct.go index 5e819bf92..9a6aeb07c 100644 --- a/iSolarCloud/AppService/queryDeviceList/struct.go +++ b/iSolarCloud/AppService/queryDeviceList/struct.go @@ -5,9 +5,9 @@ package queryDeviceList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceListByUserId/data.go b/iSolarCloud/AppService/queryDeviceListByUserId/data.go index 8400fb9d4..a943f882d 100644 --- a/iSolarCloud/AppService/queryDeviceListByUserId/data.go +++ b/iSolarCloud/AppService/queryDeviceListByUserId/data.go @@ -1,11 +1,12 @@ package queryDeviceListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryDeviceListByUserId" @@ -25,8 +26,8 @@ func (rd RequestData) Help() string { } type ResultData struct { - List []interface{} `json:"list"` - RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` + List []interface{} `json:"list"` + RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/queryDeviceListByUserId/struct.go b/iSolarCloud/AppService/queryDeviceListByUserId/struct.go index 829c435a6..dfcf02da4 100644 --- a/iSolarCloud/AppService/queryDeviceListByUserId/struct.go +++ b/iSolarCloud/AppService/queryDeviceListByUserId/struct.go @@ -5,9 +5,9 @@ package queryDeviceListByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceListForApp/data.go b/iSolarCloud/AppService/queryDeviceListForApp/data.go index 29441bef0..900e1785c 100644 --- a/iSolarCloud/AppService/queryDeviceListForApp/data.go +++ b/iSolarCloud/AppService/queryDeviceListForApp/data.go @@ -1,10 +1,11 @@ package queryDeviceListForApp import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/queryDeviceListForApp" @@ -27,56 +28,56 @@ func (rd RequestData) Help() string { // ResultData - Both getDeviceList & queryDeviceListForApp have the same output. type ResultData struct { PageList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey" PointIdFrom:"PsKey" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey" PointIdFrom:"PsKey" PointIdReplace:"true"` - PsKey valueTypes.PsKey `json:"ps_key"` - PsId valueTypes.PsId `json:"ps_id"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceCode valueTypes.Integer `json:"device_code"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` - Sn valueTypes.String `json:"sn" PointName:"Serial Number"` - FactoryName valueTypes.String `json:"factory_name"` + PsKey valueTypes.PsKey `json:"ps_key"` + PsId valueTypes.PsId `json:"ps_id"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceCode valueTypes.Integer `json:"device_code"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + Sn valueTypes.String `json:"sn" PointName:"Serial Number"` + FactoryName valueTypes.String `json:"factory_name"` - AttrId valueTypes.Integer `json:"attr_id"` - CommandStatus valueTypes.Integer `json:"command_status"` - ConnectState valueTypes.Bool `json:"connect_state"` - DataFlag valueTypes.Integer `json:"data_flag"` - DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` + AttrId valueTypes.Integer `json:"attr_id"` + CommandStatus valueTypes.Integer `json:"command_status"` + ConnectState valueTypes.Bool `json:"connect_state"` + DataFlag valueTypes.Integer `json:"data_flag"` + DataFlagDetail valueTypes.Integer `json:"data_flag_detail"` - DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` - DevStatus valueTypes.Bool `json:"dev_status"` - DeviceArea valueTypes.String `json:"device_area"` - DeviceFactoryDate valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"DateTimeLayout"` - 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"` - DeviceName valueTypes.String `json:"device_name"` - DeviceProSn valueTypes.String `json:"device_pro_sn"` - DeviceState valueTypes.Integer `json:"device_state"` - DeviceSubType interface{} `json:"device_sub_type"` - DeviceSubTypeName interface{} `json:"device_sub_type_name"` + DevFaultStatus valueTypes.Integer `json:"dev_fault_status"` + DevStatus valueTypes.Bool `json:"dev_status"` + DeviceArea valueTypes.String `json:"device_area"` + DeviceFactoryDate valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"DateTimeLayout"` + 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"` + DeviceName valueTypes.String `json:"device_name"` + DeviceProSn valueTypes.String `json:"device_pro_sn"` + DeviceState valueTypes.Integer `json:"device_state"` + DeviceSubType interface{} `json:"device_sub_type"` + DeviceSubTypeName interface{} `json:"device_sub_type_name"` - IsCountryCheck valueTypes.Bool `json:"is_country_check"` - IsHasFunctionEnum valueTypes.Bool `json:"is_has_function_enum"` - IsHasTheAbility valueTypes.Bool `json:"is_has_the_ability"` - IsInit valueTypes.Bool `json:"is_init"` - IsReadSet valueTypes.Bool `json:"is_read_set"` - IsReplacing valueTypes.Bool `json:"is_replacing"` - IsReset valueTypes.Bool `json:"is_reset"` - IsSecond valueTypes.Bool `json:"is_second"` - IsThirdParty valueTypes.Bool `json:"is_third_party"` + IsCountryCheck valueTypes.Bool `json:"is_country_check"` + IsHasFunctionEnum valueTypes.Bool `json:"is_has_function_enum"` + IsHasTheAbility valueTypes.Bool `json:"is_has_the_ability"` + IsInit valueTypes.Bool `json:"is_init"` + IsReadSet valueTypes.Bool `json:"is_read_set"` + IsReplacing valueTypes.Bool `json:"is_replacing"` + IsReset valueTypes.Bool `json:"is_reset"` + IsSecond valueTypes.Bool `json:"is_second"` + IsThirdParty valueTypes.Bool `json:"is_third_party"` - InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` - InverterModelType valueTypes.Integer `json:"inverter_model_type"` - ModuleUUID valueTypes.Integer `json:"module_uuid"` - OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` - P24 interface{} `json:"p24"` - Posx interface{} `json:"posx"` - Posy interface{} `json:"posy"` - RelState valueTypes.Bool `json:"rel_state"` - TypeName valueTypes.String `json:"type_name"` - UUID valueTypes.Integer `json:"uuid"` + InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"` + InverterModelType valueTypes.Integer `json:"inverter_model_type"` + ModuleUUID valueTypes.Integer `json:"module_uuid"` + OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"` + P24 interface{} `json:"p24"` + Posx interface{} `json:"posx"` + Posy interface{} `json:"posy"` + RelState valueTypes.Bool `json:"rel_state"` + TypeName valueTypes.String `json:"type_name"` + UUID valueTypes.Integer `json:"uuid"` } `json:"pageList" PointId:"devices" DataTable:"true" DataTableSortOn:"PsKey"` RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } diff --git a/iSolarCloud/AppService/queryDeviceListForApp/struct.go b/iSolarCloud/AppService/queryDeviceListForApp/struct.go index 82c4d9b05..8a0ef05fe 100644 --- a/iSolarCloud/AppService/queryDeviceListForApp/struct.go +++ b/iSolarCloud/AppService/queryDeviceListForApp/struct.go @@ -5,9 +5,9 @@ package queryDeviceListForApp import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceModelTechnical/data.go b/iSolarCloud/AppService/queryDeviceModelTechnical/data.go index 0f78d2bb3..f0ca7a35c 100644 --- a/iSolarCloud/AppService/queryDeviceModelTechnical/data.go +++ b/iSolarCloud/AppService/queryDeviceModelTechnical/data.go @@ -1,11 +1,12 @@ package queryDeviceModelTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryDeviceModelTechnical" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go b/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go index cf2bec1bc..408647485 100644 --- a/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go +++ b/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go @@ -5,9 +5,9 @@ package queryDeviceModelTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go index cef954226..c186dedff 100644 --- a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go +++ b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go @@ -1,9 +1,9 @@ package queryDevicePointDayMonthYearDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/commonService/queryDevicePointDayMonthYearDataList" @@ -11,12 +11,12 @@ const Disabled = false const EndPointName = "AppService.queryDevicePointDayMonthYearDataList" type RequestData struct { - PsKey valueTypes.PsKey `json:"ps_key" required:"true"` - DataPoint valueTypes.String `json:"data_point" required:"true"` - StartTime valueTypes.DateTime `json:"start_time" required:"true"` - EndTime valueTypes.DateTime `json:"end_time" required:"true"` - DataType valueTypes.String `json:"data_type" required:"true"` - QueryType valueTypes.String `json:"query_type" required:"true"` + PsKey valueTypes.PsKey `json:"ps_key" required:"true"` + DataPoint valueTypes.String `json:"data_point" required:"true"` + StartTime valueTypes.DateTime `json:"start_time" required:"true"` + EndTime valueTypes.DateTime `json:"end_time" required:"true"` + DataType valueTypes.String `json:"data_type" required:"true"` + QueryType valueTypes.String `json:"query_type" required:"true"` } func (rd *RequestData) IsValid() error { @@ -40,6 +40,6 @@ func (e *ResultData) IsValid() error { func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() - entries.StructToDataMap(*e, e.Request.PsKey.String(), GoStruct.NewEndPointPath(e.Request.PsKey.String())) + entries.StructToDataMap(*e, e.Request.PsKey.String(), GoStruct.NewEndPointPath(e.Request.PsKey.String())) return entries } diff --git a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go index 9e657a85c..27b911df8 100644 --- a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go +++ b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go @@ -5,9 +5,9 @@ package queryDevicePointDayMonthYearDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go b/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go index 4515f3d8b..e0e23e9d0 100644 --- a/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go +++ b/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go @@ -1,10 +1,11 @@ package queryDevicePointMinuteDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -33,7 +34,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { Data []DataPoint `json:"data" PointIdReplace:"false" DataTable:"true" DataTableSortOn:"TimeStamp"` } @@ -58,9 +58,9 @@ func (e *ResultData) UnmarshalJSON(data []byte) error { type DataPoint struct { GoStruct.GoStructParent `json:"-" PointIdReplace:"true" PointIdFrom:"TimeStamp" PointNameDateFormat:"DateTimeAltLayout" PointTimestampFrom:"TimeStamp"` - TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeLayout"` - Points map[string]valueTypes.UnitValue `json:"points"` - IsPlatformDefaultUnit valueTypes.Bool `json:"is_platform_default_unit"` + TimeStamp valueTypes.DateTime `json:"time_stamp" PointNameDateFormat:"DateTimeLayout"` + Points map[string]valueTypes.UnitValue `json:"points"` + IsPlatformDefaultUnit valueTypes.Bool `json:"is_platform_default_unit"` } func (e *DataPoint) UnmarshalJSON(data []byte) error { @@ -85,7 +85,7 @@ func (e *DataPoint) UnmarshalJSON(data []byte) error { break } - d.Points = make(map[string]valueTypes.UnitValue) // @TODO - change to UVS + d.Points = make(map[string]valueTypes.UnitValue) // @TODO - change to UVS for k, v := range mp { if k == "is_platform_default_unit" { continue @@ -105,7 +105,6 @@ func (e *DataPoint) UnmarshalJSON(data []byte) error { return err } - func (e *ResultData) IsValid() error { var err error return err diff --git a/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go b/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go index bf9b9633f..119f35308 100644 --- a/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go +++ b/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go @@ -5,9 +5,9 @@ package queryDevicePointMinuteDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go index 7edc2fc6b..8ea58a80e 100644 --- a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go +++ b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go @@ -1,9 +1,9 @@ package queryDevicePointsDayMonthYearDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,13 +13,13 @@ const Disabled = false const EndPointName = "AppService.queryDevicePointsDayMonthYearDataList" type RequestData struct { - PsKey valueTypes.PsKey `json:"ps_key" required:"true"` - DataPoint valueTypes.String `json:"data_point" required:"true"` - StartTime valueTypes.DateTime `json:"start_time" required:"true"` - EndTime valueTypes.DateTime `json:"end_time" required:"true"` - DataType valueTypes.String `json:"data_type" required:"true"` - QueryType valueTypes.String `json:"query_type" required:"true"` - Points valueTypes.String `json:"points" required:"true"` + PsKey valueTypes.PsKey `json:"ps_key" required:"true"` + DataPoint valueTypes.String `json:"data_point" required:"true"` + StartTime valueTypes.DateTime `json:"start_time" required:"true"` + EndTime valueTypes.DateTime `json:"end_time" required:"true"` + DataType valueTypes.String `json:"data_type" required:"true"` + QueryType valueTypes.String `json:"query_type" required:"true"` + Points valueTypes.String `json:"points" required:"true"` } func (rd RequestData) IsValid() error { @@ -31,8 +31,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { One []struct { TimeStamp valueTypes.DateTime `json:"time_stamp"` } `json:"1"` diff --git a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go index 6835b0a61..6d0b34fda 100644 --- a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go +++ b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go @@ -5,9 +5,9 @@ package queryDevicePointsDayMonthYearDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go index 96ae8c0fb..5b5116998 100644 --- a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go +++ b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go @@ -1,9 +1,9 @@ package queryDeviceRealTimeDataByPsKeys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "AppService.queryDeviceRealTimeDataByPsKeys" type RequestData struct { - PsKeyList valueTypes.String `json:"ps_key_list" required:"true"` + PsKeyList valueTypes.String `json:"ps_key_list" required:"true"` PsKeyList2 valueTypes.String `json:"ps_ke_list" required:"true"` } @@ -28,7 +28,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go index dadbe17d7..d86b17131 100644 --- a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go +++ b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go @@ -5,9 +5,9 @@ package queryDeviceRealTimeDataByPsKeys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceRepairList/data.go b/iSolarCloud/AppService/queryDeviceRepairList/data.go index fb9689978..f714ac191 100644 --- a/iSolarCloud/AppService/queryDeviceRepairList/data.go +++ b/iSolarCloud/AppService/queryDeviceRepairList/data.go @@ -1,11 +1,12 @@ package queryDeviceRepairList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryDeviceRepairList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryDeviceRepairList/struct.go b/iSolarCloud/AppService/queryDeviceRepairList/struct.go index d29b9b026..3b09aaef0 100644 --- a/iSolarCloud/AppService/queryDeviceRepairList/struct.go +++ b/iSolarCloud/AppService/queryDeviceRepairList/struct.go @@ -5,9 +5,9 @@ package queryDeviceRepairList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go b/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go index 57029d688..de38ed7ae 100644 --- a/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go +++ b/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go @@ -1,11 +1,12 @@ package queryDeviceTypeInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryDeviceTypeInfoList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go b/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go index 5a9b941d8..a21e6734f 100644 --- a/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go +++ b/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go @@ -5,9 +5,9 @@ package queryDeviceTypeInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryEnvironmentList/data.go b/iSolarCloud/AppService/queryEnvironmentList/data.go index 9272f00a4..f55824d59 100644 --- a/iSolarCloud/AppService/queryEnvironmentList/data.go +++ b/iSolarCloud/AppService/queryEnvironmentList/data.go @@ -1,11 +1,12 @@ package queryEnvironmentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryEnvironmentList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryEnvironmentList/struct.go b/iSolarCloud/AppService/queryEnvironmentList/struct.go index 118212319..5a573b747 100644 --- a/iSolarCloud/AppService/queryEnvironmentList/struct.go +++ b/iSolarCloud/AppService/queryEnvironmentList/struct.go @@ -5,9 +5,9 @@ package queryEnvironmentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultList/data.go b/iSolarCloud/AppService/queryFaultList/data.go index 0b237b298..b84a61b29 100644 --- a/iSolarCloud/AppService/queryFaultList/data.go +++ b/iSolarCloud/AppService/queryFaultList/data.go @@ -1,11 +1,12 @@ package queryFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryFaultList/struct.go b/iSolarCloud/AppService/queryFaultList/struct.go index 090781a83..7f9a52e57 100644 --- a/iSolarCloud/AppService/queryFaultList/struct.go +++ b/iSolarCloud/AppService/queryFaultList/struct.go @@ -5,9 +5,9 @@ package queryFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultPlanDetail/data.go b/iSolarCloud/AppService/queryFaultPlanDetail/data.go index 4d2a53b0e..7132237d6 100644 --- a/iSolarCloud/AppService/queryFaultPlanDetail/data.go +++ b/iSolarCloud/AppService/queryFaultPlanDetail/data.go @@ -1,11 +1,12 @@ package queryFaultPlanDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultPlanDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryFaultPlanDetail/struct.go b/iSolarCloud/AppService/queryFaultPlanDetail/struct.go index 9c8d17d40..9ba41b73d 100644 --- a/iSolarCloud/AppService/queryFaultPlanDetail/struct.go +++ b/iSolarCloud/AppService/queryFaultPlanDetail/struct.go @@ -5,9 +5,9 @@ package queryFaultPlanDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultRepairSteps/data.go b/iSolarCloud/AppService/queryFaultRepairSteps/data.go index 2247bcfb9..5c1ec5c7a 100644 --- a/iSolarCloud/AppService/queryFaultRepairSteps/data.go +++ b/iSolarCloud/AppService/queryFaultRepairSteps/data.go @@ -1,11 +1,12 @@ package queryFaultRepairSteps import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultRepairSteps" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryFaultRepairSteps/struct.go b/iSolarCloud/AppService/queryFaultRepairSteps/struct.go index 238c548f4..4d41bdc26 100644 --- a/iSolarCloud/AppService/queryFaultRepairSteps/struct.go +++ b/iSolarCloud/AppService/queryFaultRepairSteps/struct.go @@ -5,9 +5,9 @@ package queryFaultRepairSteps import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go index 5cc960c9c..c7d616dc9 100644 --- a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go +++ b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go @@ -1,11 +1,12 @@ package queryFaultTypeAndLevelByCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultTypeAndLevelByCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go index 05c798560..022bdbce2 100644 --- a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go +++ b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go @@ -5,9 +5,9 @@ package queryFaultTypeAndLevelByCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultTypeByDevice/data.go b/iSolarCloud/AppService/queryFaultTypeByDevice/data.go index a45e21939..961aec5e0 100644 --- a/iSolarCloud/AppService/queryFaultTypeByDevice/data.go +++ b/iSolarCloud/AppService/queryFaultTypeByDevice/data.go @@ -1,10 +1,11 @@ package queryFaultTypeByDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"FaultTypeCode"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"FaultTypeCode"` FaultTypeCode valueTypes.Integer `json:"fault_type_code"` FaultTypeCodeList []valueTypes.Integer `json:"fault_type_code_list"` diff --git a/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go b/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go index 6d6587b28..63c3bdd74 100644 --- a/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go +++ b/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go @@ -5,9 +5,9 @@ package queryFaultTypeByDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go b/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go index b89dd6f31..50765c42b 100644 --- a/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go +++ b/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go @@ -1,10 +1,11 @@ package queryFaultTypeByDevicePage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -33,7 +34,7 @@ type ResultData struct { 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"` + 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"` diff --git a/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go b/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go index 204e05fd7..59160a5c9 100644 --- a/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go +++ b/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go @@ -5,9 +5,9 @@ package queryFaultTypeByDevicePage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go index a0e402e51..fa68159d1 100644 --- a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go +++ b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go @@ -1,10 +1,11 @@ package queryFirmwareFilesPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go b/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go index dce26fc03..beb3c9672 100644 --- a/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go +++ b/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go @@ -5,9 +5,9 @@ package queryFirmwareFilesPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryInfotoAlert/data.go b/iSolarCloud/AppService/queryInfotoAlert/data.go index c84926cc4..af0d271b5 100644 --- a/iSolarCloud/AppService/queryInfotoAlert/data.go +++ b/iSolarCloud/AppService/queryInfotoAlert/data.go @@ -1,11 +1,12 @@ package queryInfotoAlert import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryInfotoAlert" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryInfotoAlert/struct.go b/iSolarCloud/AppService/queryInfotoAlert/struct.go index 7f3c9ee35..9078c0077 100644 --- a/iSolarCloud/AppService/queryInfotoAlert/struct.go +++ b/iSolarCloud/AppService/queryInfotoAlert/struct.go @@ -5,9 +5,9 @@ package queryInfotoAlert import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryInverterModelList/data.go b/iSolarCloud/AppService/queryInverterModelList/data.go index 30da2b9fd..511d5b6ed 100644 --- a/iSolarCloud/AppService/queryInverterModelList/data.go +++ b/iSolarCloud/AppService/queryInverterModelList/data.go @@ -1,10 +1,11 @@ package queryInverterModelList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,9 +25,8 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DeviceModelId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DeviceModelId"` DeviceModelId valueTypes.Integer `json:"device_model_id"` DeviceModel valueTypes.String `json:"device_model"` diff --git a/iSolarCloud/AppService/queryInverterModelList/struct.go b/iSolarCloud/AppService/queryInverterModelList/struct.go index 6dedf7ba2..aba310a24 100644 --- a/iSolarCloud/AppService/queryInverterModelList/struct.go +++ b/iSolarCloud/AppService/queryInverterModelList/struct.go @@ -5,9 +5,9 @@ package queryInverterModelList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryInverterVersionList/data.go b/iSolarCloud/AppService/queryInverterVersionList/data.go index a10ae897a..4437b6d6c 100644 --- a/iSolarCloud/AppService/queryInverterVersionList/data.go +++ b/iSolarCloud/AppService/queryInverterVersionList/data.go @@ -1,11 +1,12 @@ package queryInverterVersionList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryInverterVersionList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryInverterVersionList/struct.go b/iSolarCloud/AppService/queryInverterVersionList/struct.go index 132942881..3bc20a9ed 100644 --- a/iSolarCloud/AppService/queryInverterVersionList/struct.go +++ b/iSolarCloud/AppService/queryInverterVersionList/struct.go @@ -5,9 +5,9 @@ package queryInverterVersionList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go b/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go index 0f3122b51..a22464d1b 100644 --- a/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go +++ b/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go @@ -1,11 +1,12 @@ package queryM2MCardInfoCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryM2MCardInfoCMCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go b/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go index 357d7bf22..7ca2f6bae 100644 --- a/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go +++ b/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go @@ -5,9 +5,9 @@ package queryM2MCardInfoCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go index 0efb468a0..b2c955a1f 100644 --- a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go +++ b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go @@ -1,11 +1,12 @@ package queryM2MCardTermInfoCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryM2MCardTermInfoCMCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go index 88d6622ee..317b48c53 100644 --- a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go +++ b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go @@ -5,9 +5,9 @@ package queryM2MCardTermInfoCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryModelInfoByModelId/data.go b/iSolarCloud/AppService/queryModelInfoByModelId/data.go index b9b6ea7fb..58aa2e696 100644 --- a/iSolarCloud/AppService/queryModelInfoByModelId/data.go +++ b/iSolarCloud/AppService/queryModelInfoByModelId/data.go @@ -1,11 +1,12 @@ package queryModelInfoByModelId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryModelInfoByModelId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryModelInfoByModelId/struct.go b/iSolarCloud/AppService/queryModelInfoByModelId/struct.go index e8949dd32..a9ff7c8c2 100644 --- a/iSolarCloud/AppService/queryModelInfoByModelId/struct.go +++ b/iSolarCloud/AppService/queryModelInfoByModelId/struct.go @@ -5,9 +5,9 @@ package queryModelInfoByModelId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryMutiPointDataList/data.go b/iSolarCloud/AppService/queryMutiPointDataList/data.go index 9291f40e3..dd28e7483 100644 --- a/iSolarCloud/AppService/queryMutiPointDataList/data.go +++ b/iSolarCloud/AppService/queryMutiPointDataList/data.go @@ -1,9 +1,9 @@ package queryMutiPointDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -32,22 +32,20 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { Data Data `json:"data" DataTable:"true" DataTableSortOn:"Timestamp"` } type Data map[valueTypes.DateTime]Value type Value struct { - GoStructParent GoStruct.GoStructParent `json:"-" PointIdFrom:"PsKey.Timestamp" PointIdReplace:"true" PointDeviceFrom:"PsKey"` + GoStructParent GoStruct.GoStructParent `json:"-" PointIdFrom:"PsKey.Timestamp" PointIdReplace:"true" PointDeviceFrom:"PsKey"` // GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey"` - Timestamp valueTypes.DateTime `json:"timestamp" PointNameDateFormat:"DateTimeLayout"` - PsKey valueTypes.PsKey `json:"ps_key"` - Points map[string]valueTypes.Generic `json:"points" PointDeviceFrom:"PsKey"` + Timestamp valueTypes.DateTime `json:"timestamp" PointNameDateFormat:"DateTimeLayout"` + PsKey valueTypes.PsKey `json:"ps_key"` + Points map[string]valueTypes.Generic `json:"points" PointDeviceFrom:"PsKey"` } - func (e *ResultData) IsValid() error { var err error return err @@ -125,7 +123,7 @@ func (e *ResultData) UnmarshalJSON(data []byte) error { ts := d[device][point][value].Timestamp if _, ok := e.Data[ts]; !ok { - rdv := Value { + rdv := Value{ Timestamp: ts, PsKey: valueTypes.SetPsKeyString(device), Points: make(map[string]valueTypes.Generic), @@ -144,10 +142,10 @@ func (e *ResultData) UnmarshalJSON(data []byte) error { return err } - // Scan incoming JSON. type scanDevices map[string]scanPoints + func (e *scanDevices) UnmarshalJSON(data []byte) error { var err error @@ -170,6 +168,7 @@ func (e *scanDevices) UnmarshalJSON(data []byte) error { } type scanPoints map[string]scanValues + func (e *scanPoints) UnmarshalJSON(data []byte) error { var err error @@ -197,6 +196,7 @@ func (e *scanPoints) UnmarshalJSON(data []byte) error { } type scanValues []scanValue + func (e *scanValues) UnmarshalJSON(data []byte) error { var err error @@ -215,10 +215,10 @@ func (e *scanValues) UnmarshalJSON(data []byte) error { *e = make(scanValues, 0) for k, v := range d { - *e = append(*e, scanValue { + *e = append(*e, scanValue{ Timestamp: valueTypes.SetDateTimeString(k), // PointId: valueTypes.SetPointIdString(v), - Value: valueTypes.SetGenericString(v), + Value: valueTypes.SetGenericString(v), }) } } @@ -229,10 +229,9 @@ func (e *scanValues) UnmarshalJSON(data []byte) error { type scanValue struct { Timestamp valueTypes.DateTime `json:"timestamp"` PointId valueTypes.PointId `json:"point_id"` - Value valueTypes.Generic `json:"value"` + Value valueTypes.Generic `json:"value"` } - // func (e *EndPoint) GetPointDataTable(points api.TemplatePoints) output.Table { // var table output.Table // diff --git a/iSolarCloud/AppService/queryMutiPointDataList/struct.go b/iSolarCloud/AppService/queryMutiPointDataList/struct.go index 0dfdf5e27..0157e6a6b 100644 --- a/iSolarCloud/AppService/queryMutiPointDataList/struct.go +++ b/iSolarCloud/AppService/queryMutiPointDataList/struct.go @@ -5,9 +5,9 @@ package queryMutiPointDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryNoticeList/data.go b/iSolarCloud/AppService/queryNoticeList/data.go index 209548853..e4916e9a0 100644 --- a/iSolarCloud/AppService/queryNoticeList/data.go +++ b/iSolarCloud/AppService/queryNoticeList/data.go @@ -1,11 +1,12 @@ package queryNoticeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/queryNoticeList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryNoticeList/struct.go b/iSolarCloud/AppService/queryNoticeList/struct.go index 23701774a..833031f67 100644 --- a/iSolarCloud/AppService/queryNoticeList/struct.go +++ b/iSolarCloud/AppService/queryNoticeList/struct.go @@ -5,9 +5,9 @@ package queryNoticeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go b/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go index cdfe5244b..b91a2ddf0 100644 --- a/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go +++ b/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go @@ -1,11 +1,12 @@ package queryNumberOfRenewalReminders import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryNumberOfRenewalReminders" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go b/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go index 4baee318d..55f18f17e 100644 --- a/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go +++ b/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go @@ -5,9 +5,9 @@ package queryNumberOfRenewalReminders import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOperRules/data.go b/iSolarCloud/AppService/queryOperRules/data.go index e0a8a971d..5416a7020 100644 --- a/iSolarCloud/AppService/queryOperRules/data.go +++ b/iSolarCloud/AppService/queryOperRules/data.go @@ -1,11 +1,12 @@ package queryOperRules import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryOperRules" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOperRules/struct.go b/iSolarCloud/AppService/queryOperRules/struct.go index 2e53b02a1..d6a430e26 100644 --- a/iSolarCloud/AppService/queryOperRules/struct.go +++ b/iSolarCloud/AppService/queryOperRules/struct.go @@ -5,9 +5,9 @@ package queryOperRules import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrderList/data.go b/iSolarCloud/AppService/queryOrderList/data.go index 87858c06f..b9adfee93 100644 --- a/iSolarCloud/AppService/queryOrderList/data.go +++ b/iSolarCloud/AppService/queryOrderList/data.go @@ -1,11 +1,12 @@ package queryOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryOrderList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrderList/struct.go b/iSolarCloud/AppService/queryOrderList/struct.go index 6ed7e94d4..35a3bcb9c 100644 --- a/iSolarCloud/AppService/queryOrderList/struct.go +++ b/iSolarCloud/AppService/queryOrderList/struct.go @@ -5,9 +5,9 @@ package queryOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrderStep/data.go b/iSolarCloud/AppService/queryOrderStep/data.go index 10536f71e..64201646a 100644 --- a/iSolarCloud/AppService/queryOrderStep/data.go +++ b/iSolarCloud/AppService/queryOrderStep/data.go @@ -1,11 +1,12 @@ package queryOrderStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryOrderStep" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrderStep/struct.go b/iSolarCloud/AppService/queryOrderStep/struct.go index 94fa38747..dcc71a33e 100644 --- a/iSolarCloud/AppService/queryOrderStep/struct.go +++ b/iSolarCloud/AppService/queryOrderStep/struct.go @@ -5,9 +5,9 @@ package queryOrderStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrgGenerationReport/data.go b/iSolarCloud/AppService/queryOrgGenerationReport/data.go index eb9724edf..512d13a9c 100644 --- a/iSolarCloud/AppService/queryOrgGenerationReport/data.go +++ b/iSolarCloud/AppService/queryOrgGenerationReport/data.go @@ -1,11 +1,12 @@ package queryOrgGenerationReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/queryOrgGenerationReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrgGenerationReport/struct.go b/iSolarCloud/AppService/queryOrgGenerationReport/struct.go index 33fd8c37a..205fc815e 100644 --- a/iSolarCloud/AppService/queryOrgGenerationReport/struct.go +++ b/iSolarCloud/AppService/queryOrgGenerationReport/struct.go @@ -5,9 +5,9 @@ package queryOrgGenerationReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrgInfoList/data.go b/iSolarCloud/AppService/queryOrgInfoList/data.go index 458c05ed6..4c2243def 100644 --- a/iSolarCloud/AppService/queryOrgInfoList/data.go +++ b/iSolarCloud/AppService/queryOrgInfoList/data.go @@ -1,11 +1,12 @@ package queryOrgInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryOrgInfoList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrgInfoList/struct.go b/iSolarCloud/AppService/queryOrgInfoList/struct.go index f1a423738..3c958c1ac 100644 --- a/iSolarCloud/AppService/queryOrgInfoList/struct.go +++ b/iSolarCloud/AppService/queryOrgInfoList/struct.go @@ -5,9 +5,9 @@ package queryOrgInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go b/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go index 53936e66c..2c408fefc 100644 --- a/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go +++ b/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go @@ -1,11 +1,12 @@ package queryOrgPowerElecPercent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/queryOrgPowerElecPercent" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go b/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go index 3d2c433ea..a868882e3 100644 --- a/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go +++ b/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go @@ -5,9 +5,9 @@ package queryOrgPowerElecPercent import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go index c6f3a08ee..d112e7f76 100644 --- a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go +++ b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go @@ -1,11 +1,12 @@ package queryOrgPsCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryOrgPsCompensationRecordList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go index ecf87d1e1..97704da9b 100644 --- a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go +++ b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go @@ -5,9 +5,9 @@ package queryOrgPsCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryParamSettingTask/data.go b/iSolarCloud/AppService/queryParamSettingTask/data.go index 4f5f6f08e..dddfbcc92 100644 --- a/iSolarCloud/AppService/queryParamSettingTask/data.go +++ b/iSolarCloud/AppService/queryParamSettingTask/data.go @@ -1,10 +1,11 @@ package queryParamSettingTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/queryParamSettingTask" @@ -34,23 +35,23 @@ type ResultData struct { OverTime valueTypes.DateTime `json:"over_time" PointNameDateFormat:"DateTimeLayout"` OverTimeZone valueTypes.DateTime `json:"over_time_zone" PointNameDateFormat:"DateTimeLayout"` - ParamList []struct { + ParamList []struct { // GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableIndex:"true"` - PointId valueTypes.PointId `json:"point_id"` - PointName valueTypes.String `json:"point_name"` - Unit valueTypes.String `json:"unit"` - SetValue valueTypes.String `json:"set_value"` - SetPrecision valueTypes.String `json:"set_precision"` - ReturnValue valueTypes.String `json:"return_value"` - SetValName valueTypes.String `json:"set_val_name"` - SetValNameVal valueTypes.String `json:"set_val_name_val"` - CommandStatus valueTypes.Integer `json:"command_status"` - CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` - CreateTimeZone valueTypes.DateTime `json:"create_time_zone" PointNameDateFormat:"DateTimeLayout"` - UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` - UpdateTimeZone valueTypes.DateTime `json:"update_time_zone" PointNameDateFormat:"DateTimeLayout"` - ParamCode valueTypes.String `json:"param_code"` + PointId valueTypes.PointId `json:"point_id"` + PointName valueTypes.String `json:"point_name"` + Unit valueTypes.String `json:"unit"` + SetValue valueTypes.String `json:"set_value"` + SetPrecision valueTypes.String `json:"set_precision"` + ReturnValue valueTypes.String `json:"return_value"` + SetValName valueTypes.String `json:"set_val_name"` + SetValNameVal valueTypes.String `json:"set_val_name_val"` + CommandStatus valueTypes.Integer `json:"command_status"` + CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` + CreateTimeZone valueTypes.DateTime `json:"create_time_zone" PointNameDateFormat:"DateTimeLayout"` + UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` + UpdateTimeZone valueTypes.DateTime `json:"update_time_zone" PointNameDateFormat:"DateTimeLayout"` + ParamCode valueTypes.String `json:"param_code"` } `json:"param_list" DataTable:"true" DataTableIndex:"true"` } diff --git a/iSolarCloud/AppService/queryParamSettingTask/struct.go b/iSolarCloud/AppService/queryParamSettingTask/struct.go index 06e334a7b..2553a41d7 100644 --- a/iSolarCloud/AppService/queryParamSettingTask/struct.go +++ b/iSolarCloud/AppService/queryParamSettingTask/struct.go @@ -5,9 +5,9 @@ package queryParamSettingTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPersonalUnitList/data.go b/iSolarCloud/AppService/queryPersonalUnitList/data.go index 12253cca3..17fc5e2ef 100644 --- a/iSolarCloud/AppService/queryPersonalUnitList/data.go +++ b/iSolarCloud/AppService/queryPersonalUnitList/data.go @@ -1,11 +1,12 @@ package queryPersonalUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryPersonalUnitList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPersonalUnitList/struct.go b/iSolarCloud/AppService/queryPersonalUnitList/struct.go index 6761bb08f..54a5c86fb 100644 --- a/iSolarCloud/AppService/queryPersonalUnitList/struct.go +++ b/iSolarCloud/AppService/queryPersonalUnitList/struct.go @@ -5,9 +5,9 @@ package queryPersonalUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPointDataTopOne/data.go b/iSolarCloud/AppService/queryPointDataTopOne/data.go index ca8328aae..359c3f5a7 100644 --- a/iSolarCloud/AppService/queryPointDataTopOne/data.go +++ b/iSolarCloud/AppService/queryPointDataTopOne/data.go @@ -1,11 +1,12 @@ package queryPointDataTopOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryPointDataTopOne" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPointDataTopOne/struct.go b/iSolarCloud/AppService/queryPointDataTopOne/struct.go index 28f9f3407..a158d93a7 100644 --- a/iSolarCloud/AppService/queryPointDataTopOne/struct.go +++ b/iSolarCloud/AppService/queryPointDataTopOne/struct.go @@ -5,9 +5,9 @@ package queryPointDataTopOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPowerStationInfo/data.go b/iSolarCloud/AppService/queryPowerStationInfo/data.go index 72c07b2cf..5d507dfc6 100644 --- a/iSolarCloud/AppService/queryPowerStationInfo/data.go +++ b/iSolarCloud/AppService/queryPowerStationInfo/data.go @@ -1,11 +1,12 @@ package queryPowerStationInfo import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -14,8 +15,8 @@ const Disabled = false const EndPointName = "AppService.queryPowerStationInfo" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id"` - Sn valueTypes.String `json:"sn"` + PsId valueTypes.PsId `json:"ps_id"` + Sn valueTypes.String `json:"sn"` } func (rd RequestData) IsValid() error { diff --git a/iSolarCloud/AppService/queryPowerStationInfo/struct.go b/iSolarCloud/AppService/queryPowerStationInfo/struct.go index f5462bba1..ef27335c4 100644 --- a/iSolarCloud/AppService/queryPowerStationInfo/struct.go +++ b/iSolarCloud/AppService/queryPowerStationInfo/struct.go @@ -5,9 +5,9 @@ package queryPowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go index 6b1f53266..ece7a78b9 100644 --- a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go +++ b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go @@ -1,11 +1,12 @@ package queryPsAreaByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsAreaByUserIdAndAreaCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go index 5f2282db8..e31a848db 100644 --- a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go +++ b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go @@ -5,9 +5,9 @@ package queryPsAreaByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsCompensationRecordList/data.go b/iSolarCloud/AppService/queryPsCompensationRecordList/data.go index 7f31e9b1b..c24a4c333 100644 --- a/iSolarCloud/AppService/queryPsCompensationRecordList/data.go +++ b/iSolarCloud/AppService/queryPsCompensationRecordList/data.go @@ -1,11 +1,12 @@ package queryPsCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsCompensationRecordList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go b/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go index 5e610e929..d6b52d190 100644 --- a/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go +++ b/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go @@ -5,9 +5,9 @@ package queryPsCompensationRecordList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsDataByDate/data.go b/iSolarCloud/AppService/queryPsDataByDate/data.go index d6aab0f25..81b5beb22 100644 --- a/iSolarCloud/AppService/queryPsDataByDate/data.go +++ b/iSolarCloud/AppService/queryPsDataByDate/data.go @@ -1,11 +1,12 @@ package queryPsDataByDate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsDataByDate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsDataByDate/struct.go b/iSolarCloud/AppService/queryPsDataByDate/struct.go index 450433611..689cbab6f 100644 --- a/iSolarCloud/AppService/queryPsDataByDate/struct.go +++ b/iSolarCloud/AppService/queryPsDataByDate/struct.go @@ -5,9 +5,9 @@ package queryPsDataByDate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsIdList/data.go b/iSolarCloud/AppService/queryPsIdList/data.go index d1e72c571..7d012bc08 100644 --- a/iSolarCloud/AppService/queryPsIdList/data.go +++ b/iSolarCloud/AppService/queryPsIdList/data.go @@ -1,10 +1,11 @@ package queryPsIdList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData []valueTypes.String // @TODO - Fix this up! +type ResultData []valueTypes.String // @TODO - Fix this up! func (e *ResultData) IsValid() error { var err error diff --git a/iSolarCloud/AppService/queryPsIdList/struct.go b/iSolarCloud/AppService/queryPsIdList/struct.go index e83798d10..df18e9c17 100644 --- a/iSolarCloud/AppService/queryPsIdList/struct.go +++ b/iSolarCloud/AppService/queryPsIdList/struct.go @@ -5,9 +5,9 @@ package queryPsIdList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go index 4b9ad5452..b0f16def5 100644 --- a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go +++ b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go @@ -1,11 +1,12 @@ package queryPsListByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsListByUserIdAndAreaCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go index 2d0be2a94..6bc7e6d45 100644 --- a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go +++ b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go @@ -5,9 +5,9 @@ package queryPsListByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsNameByPsId/data.go b/iSolarCloud/AppService/queryPsNameByPsId/data.go index 13a9a11d3..f70463b92 100644 --- a/iSolarCloud/AppService/queryPsNameByPsId/data.go +++ b/iSolarCloud/AppService/queryPsNameByPsId/data.go @@ -1,11 +1,12 @@ package queryPsNameByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -14,7 +15,7 @@ const Disabled = false const EndPointName = "AppService.queryPsNameByPsId" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsNameByPsId/struct.go b/iSolarCloud/AppService/queryPsNameByPsId/struct.go index eb2a08460..5aff6bd9f 100644 --- a/iSolarCloud/AppService/queryPsNameByPsId/struct.go +++ b/iSolarCloud/AppService/queryPsNameByPsId/struct.go @@ -5,9 +5,9 @@ package queryPsNameByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsPrByDate/data.go b/iSolarCloud/AppService/queryPsPrByDate/data.go index 0c8c38e02..bc338c67e 100644 --- a/iSolarCloud/AppService/queryPsPrByDate/data.go +++ b/iSolarCloud/AppService/queryPsPrByDate/data.go @@ -1,11 +1,12 @@ package queryPsPrByDate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsPrByDate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsPrByDate/struct.go b/iSolarCloud/AppService/queryPsPrByDate/struct.go index 31778c421..608a67129 100644 --- a/iSolarCloud/AppService/queryPsPrByDate/struct.go +++ b/iSolarCloud/AppService/queryPsPrByDate/struct.go @@ -5,9 +5,9 @@ package queryPsPrByDate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsProfit/data.go b/iSolarCloud/AppService/queryPsProfit/data.go index f364f7796..9279e712c 100644 --- a/iSolarCloud/AppService/queryPsProfit/data.go +++ b/iSolarCloud/AppService/queryPsProfit/data.go @@ -1,10 +1,11 @@ package queryPsProfit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,9 +14,9 @@ const Disabled = false const EndPointName = "AppService.queryPsProfit" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` DateId valueTypes.DateTime `json:"date_id" required:"true"` - DateType valueTypes.String `json:"date_type" required:"true"` + DateType valueTypes.String `json:"date_type" required:"true"` } func (rd RequestData) IsValid() error { @@ -31,33 +32,33 @@ func (rd RequestData) Help() string { type ResultData struct { ActualList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateId" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"UpdateTime"` + GoStruct GoStruct.GoStruct `json:"-" PointIdReplace:"true" PointIdFrom:"DateId" PointNameDateFormat:"DateLayoutDay" PointTimestampFrom:"UpdateTime"` - DateId valueTypes.DateTime `json:"date_id" PointNameDateFormat:"DateLayout" PointTimestampFrom:"UpdateTime"` - UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` + DateId valueTypes.DateTime `json:"date_id" PointNameDateFormat:"DateLayout" PointTimestampFrom:"UpdateTime"` + UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"DateTimeLayout"` - NetPowerProfit valueTypes.Float `json:"net_power_profit" PointTimestampFrom:"UpdateTime"` - SubsidyProfit interface{} `json:"subsidy_profit" PointTimestampFrom:"UpdateTime"` - UsePowerProfit valueTypes.Float `json:"use_power_profit" PointTimestampFrom:"UpdateTime"` - UsePowerByDiscountProfit valueTypes.Float `json:"use_power_by_discount_profit" PointTimestampFrom:"UpdateTime"` - TotalProfit valueTypes.Float `json:"total_profit" PointTimestampFrom:"UpdateTime"` + NetPowerProfit valueTypes.Float `json:"net_power_profit" PointTimestampFrom:"UpdateTime"` + SubsidyProfit interface{} `json:"subsidy_profit" PointTimestampFrom:"UpdateTime"` + UsePowerProfit valueTypes.Float `json:"use_power_profit" PointTimestampFrom:"UpdateTime"` + UsePowerByDiscountProfit valueTypes.Float `json:"use_power_by_discount_profit" PointTimestampFrom:"UpdateTime"` + TotalProfit valueTypes.Float `json:"total_profit" PointTimestampFrom:"UpdateTime"` - NetPowerQuantityTotal valueTypes.Float `json:"net_power_quantity_total" PointTimestampFrom:"UpdateTime"` - PowerQuantityTotal valueTypes.Float `json:"power_quantity_total" PointTimestampFrom:"UpdateTime"` - UsePowerQuantityTotal valueTypes.Float `json:"use_power_quantity_total" PointTimestampFrom:"UpdateTime"` + NetPowerQuantityTotal valueTypes.Float `json:"net_power_quantity_total" PointTimestampFrom:"UpdateTime"` + PowerQuantityTotal valueTypes.Float `json:"power_quantity_total" PointTimestampFrom:"UpdateTime"` + UsePowerQuantityTotal valueTypes.Float `json:"use_power_quantity_total" PointTimestampFrom:"UpdateTime"` - CuspNetPowerQuantity interface{} `json:"cusp_net_power_quantity" PointTimestampFrom:"UpdateTime"` - CuspPowerQuantity interface{} `json:"cusp_power_quantity" PointTimestampFrom:"UpdateTime"` - CuspUsePowerQuantity interface{} `json:"cusp_use_power_quantity" PointTimestampFrom:"UpdateTime"` - FlatNetPowerQuantity valueTypes.Float `json:"flat_net_power_quantity" PointTimestampFrom:"UpdateTime"` - FlatPowerQuantity valueTypes.Float `json:"flat_power_quantity" PointTimestampFrom:"UpdateTime"` - FlatUsePowerQuantity valueTypes.Float `json:"flat_use_power_quantity" PointTimestampFrom:"UpdateTime"` - PeakNetPowerQuantity interface{} `json:"peak_net_power_quantity" PointTimestampFrom:"UpdateTime"` - PeakPowerQuantity interface{} `json:"peak_power_quantity" PointTimestampFrom:"UpdateTime"` - PeakUsePowerQuantity interface{} `json:"peak_use_power_quantity" PointTimestampFrom:"UpdateTime"` - ValleyNetPowerQuantity interface{} `json:"valley_net_power_quantity" PointTimestampFrom:"UpdateTime"` - ValleyPowerQuantity interface{} `json:"valley_power_quantity" PointTimestampFrom:"UpdateTime"` - ValleyUsePowerQuantity interface{} `json:"valley_use_power_quantity" PointTimestampFrom:"UpdateTime"` + CuspNetPowerQuantity interface{} `json:"cusp_net_power_quantity" PointTimestampFrom:"UpdateTime"` + CuspPowerQuantity interface{} `json:"cusp_power_quantity" PointTimestampFrom:"UpdateTime"` + CuspUsePowerQuantity interface{} `json:"cusp_use_power_quantity" PointTimestampFrom:"UpdateTime"` + FlatNetPowerQuantity valueTypes.Float `json:"flat_net_power_quantity" PointTimestampFrom:"UpdateTime"` + FlatPowerQuantity valueTypes.Float `json:"flat_power_quantity" PointTimestampFrom:"UpdateTime"` + FlatUsePowerQuantity valueTypes.Float `json:"flat_use_power_quantity" PointTimestampFrom:"UpdateTime"` + PeakNetPowerQuantity interface{} `json:"peak_net_power_quantity" PointTimestampFrom:"UpdateTime"` + PeakPowerQuantity interface{} `json:"peak_power_quantity" PointTimestampFrom:"UpdateTime"` + PeakUsePowerQuantity interface{} `json:"peak_use_power_quantity" PointTimestampFrom:"UpdateTime"` + ValleyNetPowerQuantity interface{} `json:"valley_net_power_quantity" PointTimestampFrom:"UpdateTime"` + ValleyPowerQuantity interface{} `json:"valley_power_quantity" PointTimestampFrom:"UpdateTime"` + ValleyUsePowerQuantity interface{} `json:"valley_use_power_quantity" PointTimestampFrom:"UpdateTime"` } `json:"actual_list" PointId:"actual" 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 a873cae5c..a546d33ec 100644 --- a/iSolarCloud/AppService/queryPsProfit/struct.go +++ b/iSolarCloud/AppService/queryPsProfit/struct.go @@ -5,9 +5,9 @@ package queryPsProfit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -346,7 +341,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -378,4 +372,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go index 1e0940ec2..56e7aa5ba 100644 --- a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go +++ b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go @@ -1,11 +1,12 @@ package queryPsReportComparativeAnalysisOfPowerGeneration import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsReportComparativeAnalysisOfPowerGeneration" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go index c0423c118..510ea3451 100644 --- a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go +++ b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go @@ -5,9 +5,9 @@ package queryPsReportComparativeAnalysisOfPowerGeneration import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPsStructureList/data.go b/iSolarCloud/AppService/queryPsStructureList/data.go index 66f462dae..2266a5168 100644 --- a/iSolarCloud/AppService/queryPsStructureList/data.go +++ b/iSolarCloud/AppService/queryPsStructureList/data.go @@ -1,10 +1,11 @@ package queryPsStructureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "AppService.queryPsStructureList" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,8 +27,8 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsKey"` - GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsKey"` + GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsId"` PsId valueTypes.Integer `json:"ps_id"` PsName valueTypes.String `json:"ps_name"` @@ -45,7 +46,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/AppService/queryPsStructureList/struct.go b/iSolarCloud/AppService/queryPsStructureList/struct.go index eed9fd062..95c4119aa 100644 --- a/iSolarCloud/AppService/queryPsStructureList/struct.go +++ b/iSolarCloud/AppService/queryPsStructureList/struct.go @@ -5,9 +5,9 @@ package queryPsStructureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go index 56c33f053..2ef19176e 100644 --- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go +++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go @@ -1,11 +1,12 @@ package queryPuuidsByCommandTotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryPuuidsByCommandTotalId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go index 659e5329c..ca3ad367d 100644 --- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go +++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go @@ -5,9 +5,9 @@ package queryPuuidsByCommandTotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go index 25603dd18..25b2decec 100644 --- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go +++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go @@ -1,11 +1,12 @@ package queryPuuidsByCommandTotalId2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryPuuidsByCommandTotalId2" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go index f400e6cfc..294e760ef 100644 --- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go +++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go @@ -5,9 +5,9 @@ package queryPuuidsByCommandTotalId2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryRepairRuleList/data.go b/iSolarCloud/AppService/queryRepairRuleList/data.go index cbf72e99e..b811519a0 100644 --- a/iSolarCloud/AppService/queryRepairRuleList/data.go +++ b/iSolarCloud/AppService/queryRepairRuleList/data.go @@ -1,11 +1,12 @@ package queryRepairRuleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryRepairRuleList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryRepairRuleList/struct.go b/iSolarCloud/AppService/queryRepairRuleList/struct.go index a63dabef7..3f8281e3c 100644 --- a/iSolarCloud/AppService/queryRepairRuleList/struct.go +++ b/iSolarCloud/AppService/queryRepairRuleList/struct.go @@ -5,9 +5,9 @@ package queryRepairRuleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryReportListForManagementPage/data.go b/iSolarCloud/AppService/queryReportListForManagementPage/data.go index f4b80366b..c1af9ee01 100644 --- a/iSolarCloud/AppService/queryReportListForManagementPage/data.go +++ b/iSolarCloud/AppService/queryReportListForManagementPage/data.go @@ -1,11 +1,12 @@ package queryReportListForManagementPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/queryReportListForManagementPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryReportListForManagementPage/struct.go b/iSolarCloud/AppService/queryReportListForManagementPage/struct.go index c80128d9e..d9ece6866 100644 --- a/iSolarCloud/AppService/queryReportListForManagementPage/struct.go +++ b/iSolarCloud/AppService/queryReportListForManagementPage/struct.go @@ -5,9 +5,9 @@ package queryReportListForManagementPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryReportMsg/data.go b/iSolarCloud/AppService/queryReportMsg/data.go index 939bd531b..2e9b3c5ef 100644 --- a/iSolarCloud/AppService/queryReportMsg/data.go +++ b/iSolarCloud/AppService/queryReportMsg/data.go @@ -1,11 +1,12 @@ package queryReportMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/queryReportMsg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryReportMsg/struct.go b/iSolarCloud/AppService/queryReportMsg/struct.go index 50ebd4477..b3c089894 100644 --- a/iSolarCloud/AppService/queryReportMsg/struct.go +++ b/iSolarCloud/AppService/queryReportMsg/struct.go @@ -5,9 +5,9 @@ package queryReportMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/querySharingPs/data.go b/iSolarCloud/AppService/querySharingPs/data.go index fdc8a90e0..4ea991bf6 100644 --- a/iSolarCloud/AppService/querySharingPs/data.go +++ b/iSolarCloud/AppService/querySharingPs/data.go @@ -1,11 +1,12 @@ package querySharingPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/querySharingPs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/querySharingPs/struct.go b/iSolarCloud/AppService/querySharingPs/struct.go index 86476499d..257645f33 100644 --- a/iSolarCloud/AppService/querySharingPs/struct.go +++ b/iSolarCloud/AppService/querySharingPs/struct.go @@ -5,9 +5,9 @@ package querySharingPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/querySysAdvancedParam/data.go b/iSolarCloud/AppService/querySysAdvancedParam/data.go index fc1ca8ea4..df03b9d43 100644 --- a/iSolarCloud/AppService/querySysAdvancedParam/data.go +++ b/iSolarCloud/AppService/querySysAdvancedParam/data.go @@ -1,9 +1,9 @@ package querySysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -29,7 +29,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/AppService/querySysAdvancedParam/struct.go b/iSolarCloud/AppService/querySysAdvancedParam/struct.go index e14eec823..def11d95a 100644 --- a/iSolarCloud/AppService/querySysAdvancedParam/struct.go +++ b/iSolarCloud/AppService/querySysAdvancedParam/struct.go @@ -5,9 +5,9 @@ package querySysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryTimeBySN/data.go b/iSolarCloud/AppService/queryTimeBySN/data.go index 89ff6e57a..0e76e518b 100644 --- a/iSolarCloud/AppService/queryTimeBySN/data.go +++ b/iSolarCloud/AppService/queryTimeBySN/data.go @@ -1,11 +1,12 @@ package queryTimeBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryTimeBySN" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryTimeBySN/struct.go b/iSolarCloud/AppService/queryTimeBySN/struct.go index d13d970b6..43a18ca49 100644 --- a/iSolarCloud/AppService/queryTimeBySN/struct.go +++ b/iSolarCloud/AppService/queryTimeBySN/struct.go @@ -5,9 +5,9 @@ package queryTimeBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go b/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go index 18845d500..ac5c018c3 100644 --- a/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go +++ b/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go @@ -1,11 +1,12 @@ package queryTrafficByDateCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryTrafficByDateCTCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go b/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go index c38ce9811..1679b9fb2 100644 --- a/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go +++ b/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go @@ -5,9 +5,9 @@ package queryTrafficByDateCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryTrafficCTCC/data.go b/iSolarCloud/AppService/queryTrafficCTCC/data.go index 8d9bdbf10..2ff421459 100644 --- a/iSolarCloud/AppService/queryTrafficCTCC/data.go +++ b/iSolarCloud/AppService/queryTrafficCTCC/data.go @@ -1,11 +1,12 @@ package queryTrafficCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryTrafficCTCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryTrafficCTCC/struct.go b/iSolarCloud/AppService/queryTrafficCTCC/struct.go index 80160bf58..cb621a48f 100644 --- a/iSolarCloud/AppService/queryTrafficCTCC/struct.go +++ b/iSolarCloud/AppService/queryTrafficCTCC/struct.go @@ -5,9 +5,9 @@ package queryTrafficCTCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUnitList/data.go b/iSolarCloud/AppService/queryUnitList/data.go index 940a4a56d..a57c28411 100644 --- a/iSolarCloud/AppService/queryUnitList/data.go +++ b/iSolarCloud/AppService/queryUnitList/data.go @@ -1,10 +1,11 @@ package queryUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"UnitConvertId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"UnitConvertId"` UnitConvertId valueTypes.Integer `json:"unit_conver_id" PointId:"unit_convert_id"` UnitName valueTypes.String `json:"unit_name"` diff --git a/iSolarCloud/AppService/queryUnitList/struct.go b/iSolarCloud/AppService/queryUnitList/struct.go index b7df3cc53..715c07201 100644 --- a/iSolarCloud/AppService/queryUnitList/struct.go +++ b/iSolarCloud/AppService/queryUnitList/struct.go @@ -5,9 +5,9 @@ package queryUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go b/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go index 80b7f7926..87103b8af 100644 --- a/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go +++ b/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go @@ -1,11 +1,12 @@ package queryUnitUuidBytotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryUnitUuidBytotalId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go b/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go index a376f47be..dc523d001 100644 --- a/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go +++ b/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go @@ -5,9 +5,9 @@ package queryUnitUuidBytotalId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserBtnPri/data.go b/iSolarCloud/AppService/queryUserBtnPri/data.go index 248413e14..758eddc67 100644 --- a/iSolarCloud/AppService/queryUserBtnPri/data.go +++ b/iSolarCloud/AppService/queryUserBtnPri/data.go @@ -1,11 +1,12 @@ package queryUserBtnPri import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserBtnPri" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserBtnPri/struct.go b/iSolarCloud/AppService/queryUserBtnPri/struct.go index 7a712813a..2c8fbe1ac 100644 --- a/iSolarCloud/AppService/queryUserBtnPri/struct.go +++ b/iSolarCloud/AppService/queryUserBtnPri/struct.go @@ -5,9 +5,9 @@ package queryUserBtnPri import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserByUserIds/data.go b/iSolarCloud/AppService/queryUserByUserIds/data.go index 10a2adb89..73fa5bcdd 100644 --- a/iSolarCloud/AppService/queryUserByUserIds/data.go +++ b/iSolarCloud/AppService/queryUserByUserIds/data.go @@ -1,11 +1,12 @@ package queryUserByUserIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserByUserIds" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserByUserIds/struct.go b/iSolarCloud/AppService/queryUserByUserIds/struct.go index dae188e96..cfafc7dc1 100644 --- a/iSolarCloud/AppService/queryUserByUserIds/struct.go +++ b/iSolarCloud/AppService/queryUserByUserIds/struct.go @@ -5,9 +5,9 @@ package queryUserByUserIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserExtensionAttribute/data.go b/iSolarCloud/AppService/queryUserExtensionAttribute/data.go index ceba74ad3..31331aaab 100644 --- a/iSolarCloud/AppService/queryUserExtensionAttribute/data.go +++ b/iSolarCloud/AppService/queryUserExtensionAttribute/data.go @@ -1,11 +1,12 @@ package queryUserExtensionAttribute import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserExtensionAttribute" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go b/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go index 178fa1952..6c8d05ec5 100644 --- a/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go +++ b/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go @@ -5,9 +5,9 @@ package queryUserExtensionAttribute import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserForStep/data.go b/iSolarCloud/AppService/queryUserForStep/data.go index bfae50195..39f6bdf9b 100644 --- a/iSolarCloud/AppService/queryUserForStep/data.go +++ b/iSolarCloud/AppService/queryUserForStep/data.go @@ -1,11 +1,12 @@ package queryUserForStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserForStep" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserForStep/struct.go b/iSolarCloud/AppService/queryUserForStep/struct.go index 489beed2b..66bf263d5 100644 --- a/iSolarCloud/AppService/queryUserForStep/struct.go +++ b/iSolarCloud/AppService/queryUserForStep/struct.go @@ -5,9 +5,9 @@ package queryUserForStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserList/data.go b/iSolarCloud/AppService/queryUserList/data.go index d5b991bb0..073d014b0 100644 --- a/iSolarCloud/AppService/queryUserList/data.go +++ b/iSolarCloud/AppService/queryUserList/data.go @@ -1,11 +1,12 @@ package queryUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserList" @@ -25,8 +26,8 @@ func (rd RequestData) Help() string { } type ResultData []struct { - UserId valueTypes.Integer `json:"user_id"` - UserName valueTypes.String `json:"user_name"` + UserId valueTypes.Integer `json:"user_id"` + UserName valueTypes.String `json:"user_name"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/queryUserList/struct.go b/iSolarCloud/AppService/queryUserList/struct.go index f572e7e99..d7ef81dc6 100644 --- a/iSolarCloud/AppService/queryUserList/struct.go +++ b/iSolarCloud/AppService/queryUserList/struct.go @@ -5,9 +5,9 @@ package queryUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserProcessPri/data.go b/iSolarCloud/AppService/queryUserProcessPri/data.go index 926dc8e6c..d2d3e1c2b 100644 --- a/iSolarCloud/AppService/queryUserProcessPri/data.go +++ b/iSolarCloud/AppService/queryUserProcessPri/data.go @@ -1,11 +1,12 @@ package queryUserProcessPri import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserProcessPri" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserProcessPri/struct.go b/iSolarCloud/AppService/queryUserProcessPri/struct.go index cb834ba7f..976648a67 100644 --- a/iSolarCloud/AppService/queryUserProcessPri/struct.go +++ b/iSolarCloud/AppService/queryUserProcessPri/struct.go @@ -5,9 +5,9 @@ package queryUserProcessPri import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUserWechatBindRel/data.go b/iSolarCloud/AppService/queryUserWechatBindRel/data.go index 5d0b7dbf4..512bff1ea 100644 --- a/iSolarCloud/AppService/queryUserWechatBindRel/data.go +++ b/iSolarCloud/AppService/queryUserWechatBindRel/data.go @@ -1,11 +1,12 @@ package queryUserWechatBindRel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryUserWechatBindRel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUserWechatBindRel/struct.go b/iSolarCloud/AppService/queryUserWechatBindRel/struct.go index ee16280a4..fd18f8026 100644 --- a/iSolarCloud/AppService/queryUserWechatBindRel/struct.go +++ b/iSolarCloud/AppService/queryUserWechatBindRel/struct.go @@ -5,9 +5,9 @@ package queryUserWechatBindRel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go index 99dc962c1..95f064005 100644 --- a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go +++ b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go @@ -1,11 +1,12 @@ package queryUuidByTotalIdAndUuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryUuidByTotalIdAndUuid" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go index 4b347773d..a29c1d090 100644 --- a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go +++ b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go @@ -5,9 +5,9 @@ package queryUuidByTotalIdAndUuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/rechargeOrderSetMeal/data.go b/iSolarCloud/AppService/rechargeOrderSetMeal/data.go index 03867ce28..35ec4297d 100644 --- a/iSolarCloud/AppService/rechargeOrderSetMeal/data.go +++ b/iSolarCloud/AppService/rechargeOrderSetMeal/data.go @@ -1,11 +1,12 @@ package rechargeOrderSetMeal import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/rechargeOrderSetMeal" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go b/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go index 47e78b912..c00c66eec 100644 --- a/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go +++ b/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go @@ -5,9 +5,9 @@ package rechargeOrderSetMeal import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go b/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go index 075ad065c..3e6711279 100644 --- a/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go +++ b/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go @@ -1,11 +1,12 @@ package renewSendReportConfirmEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/renewSendReportConfirmEmail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go b/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go index 93cffdbd8..43fe5375e 100644 --- a/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go +++ b/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go @@ -5,9 +5,9 @@ package renewSendReportConfirmEmail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/reportList/data.go b/iSolarCloud/AppService/reportList/data.go index 5ec2ab2e2..f3c38c6a2 100644 --- a/iSolarCloud/AppService/reportList/data.go +++ b/iSolarCloud/AppService/reportList/data.go @@ -1,10 +1,10 @@ package reportList import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/reportList" @@ -12,9 +12,9 @@ const Disabled = false const EndPointName = "AppService.reportList" const ( - Day = 1 + Day = 1 Month = 2 - Year = 3 + Year = 3 Total = 4 ) diff --git a/iSolarCloud/AppService/reportList/struct.go b/iSolarCloud/AppService/reportList/struct.go index 63fe343f6..9da00924b 100644 --- a/iSolarCloud/AppService/reportList/struct.go +++ b/iSolarCloud/AppService/reportList/struct.go @@ -5,9 +5,9 @@ package reportList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveCustomerEmployee/data.go b/iSolarCloud/AppService/saveCustomerEmployee/data.go index 35d98ae1c..63fa45035 100644 --- a/iSolarCloud/AppService/saveCustomerEmployee/data.go +++ b/iSolarCloud/AppService/saveCustomerEmployee/data.go @@ -1,11 +1,12 @@ package saveCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveCustomerEmployee" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveCustomerEmployee/struct.go b/iSolarCloud/AppService/saveCustomerEmployee/struct.go index 6ceef8f04..f4e487912 100644 --- a/iSolarCloud/AppService/saveCustomerEmployee/struct.go +++ b/iSolarCloud/AppService/saveCustomerEmployee/struct.go @@ -5,9 +5,9 @@ package saveCustomerEmployee import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveDevSimList/data.go b/iSolarCloud/AppService/saveDevSimList/data.go index d3c337956..4e96290f1 100644 --- a/iSolarCloud/AppService/saveDevSimList/data.go +++ b/iSolarCloud/AppService/saveDevSimList/data.go @@ -1,11 +1,12 @@ package saveDevSimList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveDevSimList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveDevSimList/struct.go b/iSolarCloud/AppService/saveDevSimList/struct.go index 9abf0db9b..58234ffbf 100644 --- a/iSolarCloud/AppService/saveDevSimList/struct.go +++ b/iSolarCloud/AppService/saveDevSimList/struct.go @@ -5,9 +5,9 @@ package saveDevSimList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go b/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go index 3d57de6b4..1bae9a7e2 100644 --- a/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go +++ b/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go @@ -1,11 +1,12 @@ package saveDeviceAccountBatchData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveDeviceAccountBatchData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go b/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go index 9046b22be..b588f256d 100644 --- a/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go +++ b/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go @@ -5,9 +5,9 @@ package saveDeviceAccountBatchData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go b/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go index 0f8e27cc1..54f1b0c2e 100644 --- a/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go +++ b/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go @@ -1,11 +1,12 @@ package saveEnviromentIncomeInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/saveEnviromentIncomeInfos" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go b/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go index 031531afe..04b167d71 100644 --- a/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go +++ b/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go @@ -5,9 +5,9 @@ package saveEnviromentIncomeInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveEnvironmentCurve/data.go b/iSolarCloud/AppService/saveEnvironmentCurve/data.go index b9f2feec9..e5bdc5ae0 100644 --- a/iSolarCloud/AppService/saveEnvironmentCurve/data.go +++ b/iSolarCloud/AppService/saveEnvironmentCurve/data.go @@ -1,11 +1,12 @@ package saveEnvironmentCurve import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveEnvironmentCurve" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveEnvironmentCurve/struct.go b/iSolarCloud/AppService/saveEnvironmentCurve/struct.go index e2eb22c5b..a2bb36e5b 100644 --- a/iSolarCloud/AppService/saveEnvironmentCurve/struct.go +++ b/iSolarCloud/AppService/saveEnvironmentCurve/struct.go @@ -5,9 +5,9 @@ package saveEnvironmentCurve import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveFirmwareFile/data.go b/iSolarCloud/AppService/saveFirmwareFile/data.go index 8fb32bc25..bf96195bb 100644 --- a/iSolarCloud/AppService/saveFirmwareFile/data.go +++ b/iSolarCloud/AppService/saveFirmwareFile/data.go @@ -1,11 +1,12 @@ package saveFirmwareFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/saveFirmwareFile" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveFirmwareFile/struct.go b/iSolarCloud/AppService/saveFirmwareFile/struct.go index 248856b65..fbd6ef364 100644 --- a/iSolarCloud/AppService/saveFirmwareFile/struct.go +++ b/iSolarCloud/AppService/saveFirmwareFile/struct.go @@ -5,9 +5,9 @@ package saveFirmwareFile import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveIncomeSettingInfos/data.go b/iSolarCloud/AppService/saveIncomeSettingInfos/data.go index dc6aaba3b..aecd136fe 100644 --- a/iSolarCloud/AppService/saveIncomeSettingInfos/data.go +++ b/iSolarCloud/AppService/saveIncomeSettingInfos/data.go @@ -1,11 +1,12 @@ package saveIncomeSettingInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/saveIncomeSettingInfos" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go b/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go index 84024e589..c6bed0c00 100644 --- a/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go +++ b/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go @@ -5,9 +5,9 @@ package saveIncomeSettingInfos import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go index a3fabf48e..2b7e86a8f 100644 --- a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go +++ b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go @@ -1,11 +1,12 @@ package saveOrUpdateGroupStringCheckRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveOrUpdateGroupStringCheckRule" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go index 031322396..0dea7a7ba 100644 --- a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go +++ b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go @@ -5,9 +5,9 @@ package saveOrUpdateGroupStringCheckRule import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveParamModel/data.go b/iSolarCloud/AppService/saveParamModel/data.go index 88bc0606a..ec3fa2737 100644 --- a/iSolarCloud/AppService/saveParamModel/data.go +++ b/iSolarCloud/AppService/saveParamModel/data.go @@ -1,11 +1,12 @@ package saveParamModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveParamModel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveParamModel/struct.go b/iSolarCloud/AppService/saveParamModel/struct.go index cd388e1ea..9ab161c57 100644 --- a/iSolarCloud/AppService/saveParamModel/struct.go +++ b/iSolarCloud/AppService/saveParamModel/struct.go @@ -5,9 +5,9 @@ package saveParamModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerCharges/data.go b/iSolarCloud/AppService/savePowerCharges/data.go index c5876ee93..599355817 100644 --- a/iSolarCloud/AppService/savePowerCharges/data.go +++ b/iSolarCloud/AppService/savePowerCharges/data.go @@ -1,11 +1,12 @@ package savePowerCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePowerCharges" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerCharges/struct.go b/iSolarCloud/AppService/savePowerCharges/struct.go index ffebdd230..bc83bac28 100644 --- a/iSolarCloud/AppService/savePowerCharges/struct.go +++ b/iSolarCloud/AppService/savePowerCharges/struct.go @@ -5,9 +5,9 @@ package savePowerCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerDevicePoint/data.go b/iSolarCloud/AppService/savePowerDevicePoint/data.go index 36ebfb860..748a0e381 100644 --- a/iSolarCloud/AppService/savePowerDevicePoint/data.go +++ b/iSolarCloud/AppService/savePowerDevicePoint/data.go @@ -1,11 +1,12 @@ package savePowerDevicePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/savePowerDevicePoint" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerDevicePoint/struct.go b/iSolarCloud/AppService/savePowerDevicePoint/struct.go index 84d89fcc0..880fc2889 100644 --- a/iSolarCloud/AppService/savePowerDevicePoint/struct.go +++ b/iSolarCloud/AppService/savePowerDevicePoint/struct.go @@ -5,9 +5,9 @@ package savePowerDevicePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerRobotInfo/data.go b/iSolarCloud/AppService/savePowerRobotInfo/data.go index 33bc6b399..6d94b028c 100644 --- a/iSolarCloud/AppService/savePowerRobotInfo/data.go +++ b/iSolarCloud/AppService/savePowerRobotInfo/data.go @@ -1,11 +1,12 @@ package savePowerRobotInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerRobotInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerRobotInfo/struct.go b/iSolarCloud/AppService/savePowerRobotInfo/struct.go index b049409a2..41d6d1a36 100644 --- a/iSolarCloud/AppService/savePowerRobotInfo/struct.go +++ b/iSolarCloud/AppService/savePowerRobotInfo/struct.go @@ -5,9 +5,9 @@ package savePowerRobotInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go b/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go index f29f8f97a..2b32d92ae 100644 --- a/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go +++ b/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go @@ -1,11 +1,12 @@ package savePowerRobotSweepAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerRobotSweepAttr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go b/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go index 13fd3be59..1659b6d00 100644 --- a/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go +++ b/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go @@ -5,9 +5,9 @@ package savePowerRobotSweepAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerSettingCharges/data.go b/iSolarCloud/AppService/savePowerSettingCharges/data.go index 6e60e7c29..bcdbab556 100644 --- a/iSolarCloud/AppService/savePowerSettingCharges/data.go +++ b/iSolarCloud/AppService/savePowerSettingCharges/data.go @@ -1,11 +1,12 @@ package savePowerSettingCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePowerSettingCharges" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerSettingCharges/struct.go b/iSolarCloud/AppService/savePowerSettingCharges/struct.go index 9394335b3..1f1567e19 100644 --- a/iSolarCloud/AppService/savePowerSettingCharges/struct.go +++ b/iSolarCloud/AppService/savePowerSettingCharges/struct.go @@ -5,9 +5,9 @@ package savePowerSettingCharges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/savePowerSettingInfo/data.go b/iSolarCloud/AppService/savePowerSettingInfo/data.go index a0e8d6139..7d1c280ef 100644 --- a/iSolarCloud/AppService/savePowerSettingInfo/data.go +++ b/iSolarCloud/AppService/savePowerSettingInfo/data.go @@ -1,11 +1,12 @@ package savePowerSettingInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePowerSettingInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/savePowerSettingInfo/struct.go b/iSolarCloud/AppService/savePowerSettingInfo/struct.go index 5554ea226..bd97d4953 100644 --- a/iSolarCloud/AppService/savePowerSettingInfo/struct.go +++ b/iSolarCloud/AppService/savePowerSettingInfo/struct.go @@ -5,9 +5,9 @@ package savePowerSettingInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveProductionBatchData/data.go b/iSolarCloud/AppService/saveProductionBatchData/data.go index f2f47872e..712990199 100644 --- a/iSolarCloud/AppService/saveProductionBatchData/data.go +++ b/iSolarCloud/AppService/saveProductionBatchData/data.go @@ -1,11 +1,12 @@ package saveProductionBatchData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveProductionBatchData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveProductionBatchData/struct.go b/iSolarCloud/AppService/saveProductionBatchData/struct.go index e474225e2..5ae6cc74a 100644 --- a/iSolarCloud/AppService/saveProductionBatchData/struct.go +++ b/iSolarCloud/AppService/saveProductionBatchData/struct.go @@ -5,9 +5,9 @@ package saveProductionBatchData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveRechargeOrderObj/data.go b/iSolarCloud/AppService/saveRechargeOrderObj/data.go index 7655861b0..d9768a6d2 100644 --- a/iSolarCloud/AppService/saveRechargeOrderObj/data.go +++ b/iSolarCloud/AppService/saveRechargeOrderObj/data.go @@ -1,11 +1,12 @@ package saveRechargeOrderObj import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/saveRechargeOrderObj" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveRechargeOrderObj/struct.go b/iSolarCloud/AppService/saveRechargeOrderObj/struct.go index 7175182d9..d1ed9120e 100644 --- a/iSolarCloud/AppService/saveRechargeOrderObj/struct.go +++ b/iSolarCloud/AppService/saveRechargeOrderObj/struct.go @@ -5,9 +5,9 @@ package saveRechargeOrderObj import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go index 90af91009..c6971b214 100644 --- a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go +++ b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go @@ -1,11 +1,12 @@ package saveRechargeOrderOtherInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/saveRechargeOrderOtherInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go index def64d9b2..d15972d3b 100644 --- a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go +++ b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go @@ -5,9 +5,9 @@ package saveRechargeOrderOtherInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveRepair/data.go b/iSolarCloud/AppService/saveRepair/data.go index 85d3c1a72..f3a04cb7a 100644 --- a/iSolarCloud/AppService/saveRepair/data.go +++ b/iSolarCloud/AppService/saveRepair/data.go @@ -1,11 +1,12 @@ package saveRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/saveRepair" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveRepair/struct.go b/iSolarCloud/AppService/saveRepair/struct.go index e0b08b256..ed0bb46a3 100644 --- a/iSolarCloud/AppService/saveRepair/struct.go +++ b/iSolarCloud/AppService/saveRepair/struct.go @@ -5,9 +5,9 @@ package saveRepair import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveReportExportColumns/data.go b/iSolarCloud/AppService/saveReportExportColumns/data.go index 0d7566fab..4de5d8554 100644 --- a/iSolarCloud/AppService/saveReportExportColumns/data.go +++ b/iSolarCloud/AppService/saveReportExportColumns/data.go @@ -1,11 +1,12 @@ package saveReportExportColumns import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/saveReportExportColumns" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveReportExportColumns/struct.go b/iSolarCloud/AppService/saveReportExportColumns/struct.go index 4f7892f8a..0697b3b6c 100644 --- a/iSolarCloud/AppService/saveReportExportColumns/struct.go +++ b/iSolarCloud/AppService/saveReportExportColumns/struct.go @@ -5,9 +5,9 @@ package saveReportExportColumns import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveSetParam/data.go b/iSolarCloud/AppService/saveSetParam/data.go index d942e51dd..0d9a9e944 100644 --- a/iSolarCloud/AppService/saveSetParam/data.go +++ b/iSolarCloud/AppService/saveSetParam/data.go @@ -1,11 +1,12 @@ package saveSetParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveSetParam" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveSetParam/struct.go b/iSolarCloud/AppService/saveSetParam/struct.go index 214821be1..a98d6ebc7 100644 --- a/iSolarCloud/AppService/saveSetParam/struct.go +++ b/iSolarCloud/AppService/saveSetParam/struct.go @@ -5,9 +5,9 @@ package saveSetParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveSysUserMsg/data.go b/iSolarCloud/AppService/saveSysUserMsg/data.go index deafcddc2..cd98d1e59 100644 --- a/iSolarCloud/AppService/saveSysUserMsg/data.go +++ b/iSolarCloud/AppService/saveSysUserMsg/data.go @@ -1,11 +1,12 @@ package saveSysUserMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/saveSysUserMsg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveSysUserMsg/struct.go b/iSolarCloud/AppService/saveSysUserMsg/struct.go index dcc4f8687..9ff9cfd5b 100644 --- a/iSolarCloud/AppService/saveSysUserMsg/struct.go +++ b/iSolarCloud/AppService/saveSysUserMsg/struct.go @@ -5,9 +5,9 @@ package saveSysUserMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/saveTemplate/data.go b/iSolarCloud/AppService/saveTemplate/data.go index e3bbfaac7..ddfb11798 100644 --- a/iSolarCloud/AppService/saveTemplate/data.go +++ b/iSolarCloud/AppService/saveTemplate/data.go @@ -1,11 +1,12 @@ package saveTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveTemplate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/saveTemplate/struct.go b/iSolarCloud/AppService/saveTemplate/struct.go index ca12dbc1f..964c7e9cb 100644 --- a/iSolarCloud/AppService/saveTemplate/struct.go +++ b/iSolarCloud/AppService/saveTemplate/struct.go @@ -5,9 +5,9 @@ package saveTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go index 43937e651..33420ec74 100644 --- a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go +++ b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go @@ -1,11 +1,12 @@ package searchM2MMonthFlowCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/searchM2MMonthFlowCMCC" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go index 85a996ff4..974a090c1 100644 --- a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go +++ b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go @@ -5,9 +5,9 @@ package searchM2MMonthFlowCMCC import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/selectSysTranslationNames/data.go b/iSolarCloud/AppService/selectSysTranslationNames/data.go index 70b4e8bdf..72fa17c1c 100644 --- a/iSolarCloud/AppService/selectSysTranslationNames/data.go +++ b/iSolarCloud/AppService/selectSysTranslationNames/data.go @@ -1,11 +1,12 @@ package selectSysTranslationNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/selectSysTranslationNames" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/selectSysTranslationNames/struct.go b/iSolarCloud/AppService/selectSysTranslationNames/struct.go index 4e2f83bc5..3ee820af2 100644 --- a/iSolarCloud/AppService/selectSysTranslationNames/struct.go +++ b/iSolarCloud/AppService/selectSysTranslationNames/struct.go @@ -5,9 +5,9 @@ package selectSysTranslationNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go b/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go index 516b58a9b..3eb48028a 100644 --- a/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go +++ b/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go @@ -1,11 +1,12 @@ package sendPsTimeZoneInstruction import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/sendPsTimeZoneInstruction" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go b/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go index 17f9b03ac..cfce01dd2 100644 --- a/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go +++ b/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go @@ -5,9 +5,9 @@ package sendPsTimeZoneInstruction import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go index 563f8944b..f5cbd439c 100644 --- a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go +++ b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go @@ -1,11 +1,12 @@ package setUpFormulaFaultAnalyse import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/setUpFormulaFaultAnalyse" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go index 5e2b59241..977b28255 100644 --- a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go +++ b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go @@ -5,9 +5,9 @@ package setUpFormulaFaultAnalyse import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/setUserGDPRAttrs/data.go b/iSolarCloud/AppService/setUserGDPRAttrs/data.go index 132f01e6f..5e2a6805a 100644 --- a/iSolarCloud/AppService/setUserGDPRAttrs/data.go +++ b/iSolarCloud/AppService/setUserGDPRAttrs/data.go @@ -1,11 +1,12 @@ package setUserGDPRAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/setUserGDPRAttrs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/setUserGDPRAttrs/struct.go b/iSolarCloud/AppService/setUserGDPRAttrs/struct.go index aa6ad62fd..978cca0c5 100644 --- a/iSolarCloud/AppService/setUserGDPRAttrs/struct.go +++ b/iSolarCloud/AppService/setUserGDPRAttrs/struct.go @@ -5,9 +5,9 @@ package setUserGDPRAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/settingNotice/data.go b/iSolarCloud/AppService/settingNotice/data.go index e23b6c8a9..23b5b1af7 100644 --- a/iSolarCloud/AppService/settingNotice/data.go +++ b/iSolarCloud/AppService/settingNotice/data.go @@ -1,11 +1,12 @@ package settingNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/settingNotice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/settingNotice/struct.go b/iSolarCloud/AppService/settingNotice/struct.go index 6e7476991..f615c5902 100644 --- a/iSolarCloud/AppService/settingNotice/struct.go +++ b/iSolarCloud/AppService/settingNotice/struct.go @@ -5,9 +5,9 @@ package settingNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/shareMyPs/data.go b/iSolarCloud/AppService/shareMyPs/data.go index 8151bf1a0..6245d2aa1 100644 --- a/iSolarCloud/AppService/shareMyPs/data.go +++ b/iSolarCloud/AppService/shareMyPs/data.go @@ -1,11 +1,12 @@ package shareMyPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/shareMyPs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/shareMyPs/struct.go b/iSolarCloud/AppService/shareMyPs/struct.go index 07f966592..485e8dde3 100644 --- a/iSolarCloud/AppService/shareMyPs/struct.go +++ b/iSolarCloud/AppService/shareMyPs/struct.go @@ -5,9 +5,9 @@ package shareMyPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sharePsBySN/data.go b/iSolarCloud/AppService/sharePsBySN/data.go index 40c3fa947..7ca31896a 100644 --- a/iSolarCloud/AppService/sharePsBySN/data.go +++ b/iSolarCloud/AppService/sharePsBySN/data.go @@ -1,11 +1,12 @@ package sharePsBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/sharePsBySN" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sharePsBySN/struct.go b/iSolarCloud/AppService/sharePsBySN/struct.go index 874f0d498..b2fb65132 100644 --- a/iSolarCloud/AppService/sharePsBySN/struct.go +++ b/iSolarCloud/AppService/sharePsBySN/struct.go @@ -5,9 +5,9 @@ package sharePsBySN import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/showInverterByUnit/data.go b/iSolarCloud/AppService/showInverterByUnit/data.go index d88b04dfb..a8b575836 100644 --- a/iSolarCloud/AppService/showInverterByUnit/data.go +++ b/iSolarCloud/AppService/showInverterByUnit/data.go @@ -1,10 +1,11 @@ package showInverterByUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/AppService/showInverterByUnit/struct.go b/iSolarCloud/AppService/showInverterByUnit/struct.go index 97896a2c5..b1f918e9c 100644 --- a/iSolarCloud/AppService/showInverterByUnit/struct.go +++ b/iSolarCloud/AppService/showInverterByUnit/struct.go @@ -5,9 +5,9 @@ package showInverterByUnit import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/showOnlineUsers/data.go b/iSolarCloud/AppService/showOnlineUsers/data.go index 62f224d03..13d988c76 100644 --- a/iSolarCloud/AppService/showOnlineUsers/data.go +++ b/iSolarCloud/AppService/showOnlineUsers/data.go @@ -1,11 +1,12 @@ package showOnlineUsers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/showOnlineUsers" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/showOnlineUsers/struct.go b/iSolarCloud/AppService/showOnlineUsers/struct.go index 8fd111a8c..4e2d1858c 100644 --- a/iSolarCloud/AppService/showOnlineUsers/struct.go +++ b/iSolarCloud/AppService/showOnlineUsers/struct.go @@ -5,9 +5,9 @@ package showOnlineUsers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/showWarning/data.go b/iSolarCloud/AppService/showWarning/data.go index 550e6de78..fb40a6981 100644 --- a/iSolarCloud/AppService/showWarning/data.go +++ b/iSolarCloud/AppService/showWarning/data.go @@ -1,11 +1,12 @@ package showWarning import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/showWarning" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/showWarning/struct.go b/iSolarCloud/AppService/showWarning/struct.go index 0323c2122..0f0d7ae88 100644 --- a/iSolarCloud/AppService/showWarning/struct.go +++ b/iSolarCloud/AppService/showWarning/struct.go @@ -5,9 +5,9 @@ package showWarning import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/snIsExist/data.go b/iSolarCloud/AppService/snIsExist/data.go index 386218e70..db7aeaa01 100644 --- a/iSolarCloud/AppService/snIsExist/data.go +++ b/iSolarCloud/AppService/snIsExist/data.go @@ -1,11 +1,12 @@ package snIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/snIsExist" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/snIsExist/struct.go b/iSolarCloud/AppService/snIsExist/struct.go index 629c2af24..2ae7b768b 100644 --- a/iSolarCloud/AppService/snIsExist/struct.go +++ b/iSolarCloud/AppService/snIsExist/struct.go @@ -5,9 +5,9 @@ package snIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/snsIsExist/data.go b/iSolarCloud/AppService/snsIsExist/data.go index a81f77ef7..35e8a1d45 100644 --- a/iSolarCloud/AppService/snsIsExist/data.go +++ b/iSolarCloud/AppService/snsIsExist/data.go @@ -1,11 +1,12 @@ package snsIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/snsIsExist" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/snsIsExist/struct.go b/iSolarCloud/AppService/snsIsExist/struct.go index 79e6d2962..741699cd6 100644 --- a/iSolarCloud/AppService/snsIsExist/struct.go +++ b/iSolarCloud/AppService/snsIsExist/struct.go @@ -5,9 +5,9 @@ package snsIsExist import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/speedyAddPowerStation/data.go b/iSolarCloud/AppService/speedyAddPowerStation/data.go index cc32f6d8c..c1ff95aac 100644 --- a/iSolarCloud/AppService/speedyAddPowerStation/data.go +++ b/iSolarCloud/AppService/speedyAddPowerStation/data.go @@ -1,11 +1,12 @@ package speedyAddPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/speedyAddPowerStation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/speedyAddPowerStation/struct.go b/iSolarCloud/AppService/speedyAddPowerStation/struct.go index 3fa400745..de884e004 100644 --- a/iSolarCloud/AppService/speedyAddPowerStation/struct.go +++ b/iSolarCloud/AppService/speedyAddPowerStation/struct.go @@ -5,9 +5,9 @@ package speedyAddPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go b/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go index 5e4d0144f..236567636 100644 --- a/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go +++ b/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go @@ -1,11 +1,12 @@ package stationDeviceHistoryDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/stationDeviceHistoryDataList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go b/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go index 58925e093..50d58b114 100644 --- a/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go +++ b/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go @@ -5,9 +5,9 @@ package stationDeviceHistoryDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationUnitsList/data.go b/iSolarCloud/AppService/stationUnitsList/data.go index 3abfe6eba..02b5a08f7 100644 --- a/iSolarCloud/AppService/stationUnitsList/data.go +++ b/iSolarCloud/AppService/stationUnitsList/data.go @@ -1,11 +1,12 @@ package stationUnitsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/stationUnitsList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/stationUnitsList/struct.go b/iSolarCloud/AppService/stationUnitsList/struct.go index ce46ec080..40268e79a 100644 --- a/iSolarCloud/AppService/stationUnitsList/struct.go +++ b/iSolarCloud/AppService/stationUnitsList/struct.go @@ -5,9 +5,9 @@ package stationUnitsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationsDiscreteData/data.go b/iSolarCloud/AppService/stationsDiscreteData/data.go index fc81a6aea..a1dbb1305 100644 --- a/iSolarCloud/AppService/stationsDiscreteData/data.go +++ b/iSolarCloud/AppService/stationsDiscreteData/data.go @@ -1,11 +1,12 @@ package stationsDiscreteData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/stationsDiscreteData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/stationsDiscreteData/struct.go b/iSolarCloud/AppService/stationsDiscreteData/struct.go index e7e4f17bc..a8765f499 100644 --- a/iSolarCloud/AppService/stationsDiscreteData/struct.go +++ b/iSolarCloud/AppService/stationsDiscreteData/struct.go @@ -5,9 +5,9 @@ package stationsDiscreteData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationsIncomeList/data.go b/iSolarCloud/AppService/stationsIncomeList/data.go index b11f42b5d..aaaa6e0df 100644 --- a/iSolarCloud/AppService/stationsIncomeList/data.go +++ b/iSolarCloud/AppService/stationsIncomeList/data.go @@ -1,11 +1,12 @@ package stationsIncomeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/stationsIncomeList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/stationsIncomeList/struct.go b/iSolarCloud/AppService/stationsIncomeList/struct.go index 69ee8ffba..b3dce6408 100644 --- a/iSolarCloud/AppService/stationsIncomeList/struct.go +++ b/iSolarCloud/AppService/stationsIncomeList/struct.go @@ -5,9 +5,9 @@ package stationsIncomeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationsPointReport/data.go b/iSolarCloud/AppService/stationsPointReport/data.go index af90b6a8c..cfd436c0f 100644 --- a/iSolarCloud/AppService/stationsPointReport/data.go +++ b/iSolarCloud/AppService/stationsPointReport/data.go @@ -1,9 +1,9 @@ package stationsPointReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -25,8 +25,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { List []struct { GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true"` @@ -62,8 +61,8 @@ type ResultData struct { So2 valueTypes.Float `json:"so2"` Tree valueTypes.Float `json:"tree"` } `json:"list" PointId:"devices" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"PsId"` - MinDateId valueTypes.DateTime `json:"min_date_id"` - RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` + MinDateId valueTypes.DateTime `json:"min_date_id"` + RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/AppService/stationsPointReport/struct.go b/iSolarCloud/AppService/stationsPointReport/struct.go index ad07b562a..0c2fd212a 100644 --- a/iSolarCloud/AppService/stationsPointReport/struct.go +++ b/iSolarCloud/AppService/stationsPointReport/struct.go @@ -5,9 +5,9 @@ package stationsPointReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/stationsYearPlanReport/data.go b/iSolarCloud/AppService/stationsYearPlanReport/data.go index 384d074de..1b2f2f41c 100644 --- a/iSolarCloud/AppService/stationsYearPlanReport/data.go +++ b/iSolarCloud/AppService/stationsYearPlanReport/data.go @@ -1,11 +1,12 @@ package stationsYearPlanReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/stationsYearPlanReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/stationsYearPlanReport/struct.go b/iSolarCloud/AppService/stationsYearPlanReport/struct.go index 98180be71..ea978cfa4 100644 --- a/iSolarCloud/AppService/stationsYearPlanReport/struct.go +++ b/iSolarCloud/AppService/stationsYearPlanReport/struct.go @@ -5,9 +5,9 @@ package stationsYearPlanReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/struct.go b/iSolarCloud/AppService/struct.go index 13eb211b4..bafde866c 100644 --- a/iSolarCloud/AppService/struct.go +++ b/iSolarCloud/AppService/struct.go @@ -1,583 +1,584 @@ package AppService import ( - "GoSungrow/iSolarCloud/AppService/acceptPsSharing" - "GoSungrow/iSolarCloud/AppService/activateEmail" - "GoSungrow/iSolarCloud/AppService/addConfig" - "GoSungrow/iSolarCloud/AppService/addDeviceRepair" - "GoSungrow/iSolarCloud/AppService/addDeviceToStructureForHousehold" - "GoSungrow/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS" - "GoSungrow/iSolarCloud/AppService/addFault" - "GoSungrow/iSolarCloud/AppService/addFaultOrder" - "GoSungrow/iSolarCloud/AppService/addFaultPlan" - "GoSungrow/iSolarCloud/AppService/addFaultRepairSteps" - "GoSungrow/iSolarCloud/AppService/addHouseholdEvaluation" - "GoSungrow/iSolarCloud/AppService/addHouseholdLeaveMessage" - "GoSungrow/iSolarCloud/AppService/addHouseholdOpinionFeedback" - "GoSungrow/iSolarCloud/AppService/addHouseholdWorkOrder" - "GoSungrow/iSolarCloud/AppService/addOnDutyInfo" - "GoSungrow/iSolarCloud/AppService/addOperRule" - "GoSungrow/iSolarCloud/AppService/addOrDelPsStructure" - "GoSungrow/iSolarCloud/AppService/addOrderStep" - "GoSungrow/iSolarCloud/AppService/addPowerStationForHousehold" - "GoSungrow/iSolarCloud/AppService/addPowerStationInfo" - "GoSungrow/iSolarCloud/AppService/addReportConfigEmail" - "GoSungrow/iSolarCloud/AppService/addSysAdvancedParam" - "GoSungrow/iSolarCloud/AppService/addSysOrgNew" - "GoSungrow/iSolarCloud/AppService/aliPayAppTest" - "GoSungrow/iSolarCloud/AppService/auditOperRule" - "GoSungrow/iSolarCloud/AppService/batchAddStationBySn" - "GoSungrow/iSolarCloud/AppService/batchImportSN" - "GoSungrow/iSolarCloud/AppService/batchInsertUserAndOrg" - "GoSungrow/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis" - "GoSungrow/iSolarCloud/AppService/batchProcessPlantReport" - "GoSungrow/iSolarCloud/AppService/batchUpdateDeviceSim" - "GoSungrow/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr" - "GoSungrow/iSolarCloud/AppService/boundMobilePhone" - "GoSungrow/iSolarCloud/AppService/boundUserMail" - "GoSungrow/iSolarCloud/AppService/caculateDeviceInputDiscrete" - "GoSungrow/iSolarCloud/AppService/calculateDeviceDiscrete" - "GoSungrow/iSolarCloud/AppService/calculateInitialCompensationData" - "GoSungrow/iSolarCloud/AppService/cancelDeliverMail" - "GoSungrow/iSolarCloud/AppService/cancelOrderScan" - "GoSungrow/iSolarCloud/AppService/cancelParamSetTask" - "GoSungrow/iSolarCloud/AppService/cancelPsSharing" - "GoSungrow/iSolarCloud/AppService/cancelRechargeOrder" - "GoSungrow/iSolarCloud/AppService/changRechargeOrderToCancel" - "GoSungrow/iSolarCloud/AppService/changeHouseholdUser2Installer" - "GoSungrow/iSolarCloud/AppService/changeRemoteParam" - "GoSungrow/iSolarCloud/AppService/checkDealerOrgCode" - "GoSungrow/iSolarCloud/AppService/checkDevSnIsBelongsToUser" - "GoSungrow/iSolarCloud/AppService/checkInverterResult" - "GoSungrow/iSolarCloud/AppService/checkIsCanDoParamSet" - "GoSungrow/iSolarCloud/AppService/checkIsIvScan" - "GoSungrow/iSolarCloud/AppService/checkOssObjectExist" - "GoSungrow/iSolarCloud/AppService/checkServiceIsConnect" - "GoSungrow/iSolarCloud/AppService/checkTechnicalParameters" - "GoSungrow/iSolarCloud/AppService/checkUnitStatus" - "GoSungrow/iSolarCloud/AppService/checkUpRechargeDevicePaying" - "GoSungrow/iSolarCloud/AppService/checkUserAccountUnique" - "GoSungrow/iSolarCloud/AppService/checkUserAccountUniqueAll" - "GoSungrow/iSolarCloud/AppService/checkUserInfoUnique" - "GoSungrow/iSolarCloud/AppService/checkUserIsExist" - "GoSungrow/iSolarCloud/AppService/checkUserListIsExist" - "GoSungrow/iSolarCloud/AppService/checkUserPassword" - "GoSungrow/iSolarCloud/AppService/cloudDeploymentRecord" - "GoSungrow/iSolarCloud/AppService/comfirmParamModel" - "GoSungrow/iSolarCloud/AppService/communicationModuleDetail" - "GoSungrow/iSolarCloud/AppService/compareValidateCode" - "GoSungrow/iSolarCloud/AppService/componentInfo2Cloud" - "GoSungrow/iSolarCloud/AppService/confirmFault" - "GoSungrow/iSolarCloud/AppService/confirmIvFault" - "GoSungrow/iSolarCloud/AppService/confirmReportConfig" - "GoSungrow/iSolarCloud/AppService/createAppkeyInfo" - "GoSungrow/iSolarCloud/AppService/createRenewInvoice" - "GoSungrow/iSolarCloud/AppService/dealCommandReply" - "GoSungrow/iSolarCloud/AppService/dealDeletePsFailPsDelete" - "GoSungrow/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks" - "GoSungrow/iSolarCloud/AppService/dealFailRemoteUpgradeTasks" - "GoSungrow/iSolarCloud/AppService/dealFaultOrder" - "GoSungrow/iSolarCloud/AppService/dealGroupStringDisableOrEnable" - "GoSungrow/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql" - "GoSungrow/iSolarCloud/AppService/dealParamSettingAfterComplete" - "GoSungrow/iSolarCloud/AppService/dealPsDataSupplement" - "GoSungrow/iSolarCloud/AppService/dealPsReportEmailSend" - "GoSungrow/iSolarCloud/AppService/dealRemoteUpgrade" - "GoSungrow/iSolarCloud/AppService/dealSnElectrifyCheck" - "GoSungrow/iSolarCloud/AppService/dealSysDeviceSimFlowInfo" - "GoSungrow/iSolarCloud/AppService/dealSysDeviceSimInfo" - "GoSungrow/iSolarCloud/AppService/definiteTimeDealSnExpRemind" - "GoSungrow/iSolarCloud/AppService/definiteTimeDealSnStatus" - "GoSungrow/iSolarCloud/AppService/delDeviceRepair" - "GoSungrow/iSolarCloud/AppService/delOperRule" - "GoSungrow/iSolarCloud/AppService/delayCallApiResidueTimes" - "GoSungrow/iSolarCloud/AppService/deleteComponent" - "GoSungrow/iSolarCloud/AppService/deleteCustomerEmployee" - "GoSungrow/iSolarCloud/AppService/deleteDeviceAccount" - "GoSungrow/iSolarCloud/AppService/deleteDeviceSimById" - "GoSungrow/iSolarCloud/AppService/deleteElectricitySettlementData" - "GoSungrow/iSolarCloud/AppService/deleteFaultPlan" - "GoSungrow/iSolarCloud/AppService/deleteFirmwareFiles" - "GoSungrow/iSolarCloud/AppService/deleteHouseholdEvaluation" - "GoSungrow/iSolarCloud/AppService/deleteHouseholdLeaveMessage" - "GoSungrow/iSolarCloud/AppService/deleteHouseholdWorkOrder" - "GoSungrow/iSolarCloud/AppService/deleteInverterSnInChnnl" - "GoSungrow/iSolarCloud/AppService/deleteModuleLog" - "GoSungrow/iSolarCloud/AppService/deleteOnDutyInfo" - "GoSungrow/iSolarCloud/AppService/deleteOperateBillFile" - "GoSungrow/iSolarCloud/AppService/deleteOssObject" - "GoSungrow/iSolarCloud/AppService/deletePowerDevicePointById" - "GoSungrow/iSolarCloud/AppService/deletePowerPicture" - "GoSungrow/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId" - "GoSungrow/iSolarCloud/AppService/deletePowerRobotSweepStrategy" - "GoSungrow/iSolarCloud/AppService/deleteProductionData" - "GoSungrow/iSolarCloud/AppService/deletePs" - "GoSungrow/iSolarCloud/AppService/deleteRechargeOrder" - "GoSungrow/iSolarCloud/AppService/deleteRegularlyConnectionInfo" - "GoSungrow/iSolarCloud/AppService/deleteReportConfigEmailAddr" - "GoSungrow/iSolarCloud/AppService/deleteSysAdvancedParam" - "GoSungrow/iSolarCloud/AppService/deleteSysOrgNew" - "GoSungrow/iSolarCloud/AppService/deleteTemplate" - "GoSungrow/iSolarCloud/AppService/deleteUserInfoAllByUserId" - "GoSungrow/iSolarCloud/AppService/deviceInputDiscreteDeleteTime" - "GoSungrow/iSolarCloud/AppService/deviceInputDiscreteGetTime" - "GoSungrow/iSolarCloud/AppService/deviceInputDiscreteInsertTime" - "GoSungrow/iSolarCloud/AppService/deviceInputDiscreteUpdateTime" - "GoSungrow/iSolarCloud/AppService/devicePointsDataFromMySql" - "GoSungrow/iSolarCloud/AppService/deviceReplace" - "GoSungrow/iSolarCloud/AppService/editDeviceRepair" - "GoSungrow/iSolarCloud/AppService/editOperRule" - "GoSungrow/iSolarCloud/AppService/energyPovertyAlleviation" - "GoSungrow/iSolarCloud/AppService/energyTrend" - "GoSungrow/iSolarCloud/AppService/exportParamSettingValPDF" - "GoSungrow/iSolarCloud/AppService/exportPlantReportPDF" - "GoSungrow/iSolarCloud/AppService/faultAutoClose" - "GoSungrow/iSolarCloud/AppService/faultCloseRemindOrderHandler" - "GoSungrow/iSolarCloud/AppService/findCodeValueList" - "GoSungrow/iSolarCloud/AppService/findEmgOrgInfo" - "GoSungrow/iSolarCloud/AppService/findEnvironmentInfo" - "GoSungrow/iSolarCloud/AppService/findFromHbaseAndRedis" - "GoSungrow/iSolarCloud/AppService/findInfoByuuid" - "GoSungrow/iSolarCloud/AppService/findLossAnalysisList" - "GoSungrow/iSolarCloud/AppService/findOnDutyInfo" - "GoSungrow/iSolarCloud/AppService/findPsType" - "GoSungrow/iSolarCloud/AppService/findSingleStationPR" - "GoSungrow/iSolarCloud/AppService/findUserPassword" - "GoSungrow/iSolarCloud/AppService/genTLSUserSigByUserAccount" - "GoSungrow/iSolarCloud/AppService/generateRandomPassword" - "GoSungrow/iSolarCloud/AppService/getAPIServiceInfo" - "GoSungrow/iSolarCloud/AppService/getAccessedPermission" - "GoSungrow/iSolarCloud/AppService/getAllDeviceByPsId" - "GoSungrow/iSolarCloud/AppService/getAllPowerDeviceSetName" - "GoSungrow/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId" - "GoSungrow/iSolarCloud/AppService/getAllPsIdByOrgIds" - "GoSungrow/iSolarCloud/AppService/getAllUserRemindCount" - "GoSungrow/iSolarCloud/AppService/getAndOutletsAndUnit" - "GoSungrow/iSolarCloud/AppService/getApiCallsForAppkeys" - "GoSungrow/iSolarCloud/AppService/getAreaInfoCodeByCounty" - "GoSungrow/iSolarCloud/AppService/getAreaList" - "GoSungrow/iSolarCloud/AppService/getAutoCreatePowerStation" - "GoSungrow/iSolarCloud/AppService/getBackReadValue" - "GoSungrow/iSolarCloud/AppService/getBatchNewestPointData" - "GoSungrow/iSolarCloud/AppService/getCallApiResidueTimes" - "GoSungrow/iSolarCloud/AppService/getChangedPsListByTime" - "GoSungrow/iSolarCloud/AppService/getChnnlListByPsId" - "GoSungrow/iSolarCloud/AppService/getCloudList" - "GoSungrow/iSolarCloud/AppService/getCloudServiceMappingConfig" - "GoSungrow/iSolarCloud/AppService/getCommunicationDeviceConfigInfo" - "GoSungrow/iSolarCloud/AppService/getCommunicationModuleMonitorData" - "GoSungrow/iSolarCloud/AppService/getComponentModelFactory" - "GoSungrow/iSolarCloud/AppService/getConfigList" - "GoSungrow/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort" - "GoSungrow/iSolarCloud/AppService/getCountDown" - "GoSungrow/iSolarCloud/AppService/getCountryServiceInfo" - "GoSungrow/iSolarCloud/AppService/getCounty" - "GoSungrow/iSolarCloud/AppService/getCustomerEmployee" - "GoSungrow/iSolarCloud/AppService/getCustomerList" - "GoSungrow/iSolarCloud/AppService/getDataFromHBase" - "GoSungrow/iSolarCloud/AppService/getDataFromHbaseByRowKey" - "GoSungrow/iSolarCloud/AppService/getDevInstalledPowerByPsId" - "GoSungrow/iSolarCloud/AppService/getDevRecord" - "GoSungrow/iSolarCloud/AppService/getDevRunRecordList" - "GoSungrow/iSolarCloud/AppService/getDevSimByList" - "GoSungrow/iSolarCloud/AppService/getDevSimList" - "GoSungrow/iSolarCloud/AppService/getDeviceAccountById" - "GoSungrow/iSolarCloud/AppService/getDeviceFaultStatisticsData" - "GoSungrow/iSolarCloud/AppService/getDeviceInfo" - "GoSungrow/iSolarCloud/AppService/getDeviceList" - "GoSungrow/iSolarCloud/AppService/getDeviceModelInfoList" - "GoSungrow/iSolarCloud/AppService/getDevicePointMinuteDataList" - "GoSungrow/iSolarCloud/AppService/getDevicePoints" - "GoSungrow/iSolarCloud/AppService/getDevicePropertys" - "GoSungrow/iSolarCloud/AppService/getDeviceRepairDetail" - "GoSungrow/iSolarCloud/AppService/getDeviceTechBranchCount" - "GoSungrow/iSolarCloud/AppService/getDeviceTypeInfoList" - "GoSungrow/iSolarCloud/AppService/getDeviceTypeList" - "GoSungrow/iSolarCloud/AppService/getDstInfo" - "GoSungrow/iSolarCloud/AppService/getElectricitySettlementData" - "GoSungrow/iSolarCloud/AppService/getElectricitySettlementDetailData" - "GoSungrow/iSolarCloud/AppService/getEncryptPublicKey" - "GoSungrow/iSolarCloud/AppService/getFaultCount" - "GoSungrow/iSolarCloud/AppService/getFaultDetail" - "GoSungrow/iSolarCloud/AppService/getFaultMsgByFaultCode" - "GoSungrow/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM" - "GoSungrow/iSolarCloud/AppService/getFaultMsgListWithYYYYMM" - "GoSungrow/iSolarCloud/AppService/getFaultPlanList" - "GoSungrow/iSolarCloud/AppService/getFileOperationRecordOne" - "GoSungrow/iSolarCloud/AppService/getFormulaFaultAnalyseList" - "GoSungrow/iSolarCloud/AppService/getGroupStringCheckResult" - "GoSungrow/iSolarCloud/AppService/getGroupStringCheckRule" - "GoSungrow/iSolarCloud/AppService/getHisData" - "GoSungrow/iSolarCloud/AppService/getHistoryInfo" - "GoSungrow/iSolarCloud/AppService/getHouseholdEvaluation" - "GoSungrow/iSolarCloud/AppService/getHouseholdLeaveMessage" - "GoSungrow/iSolarCloud/AppService/getHouseholdOpinionFeedback" - "GoSungrow/iSolarCloud/AppService/getHouseholdPsInstallerByUserId" - "GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" - "GoSungrow/iSolarCloud/AppService/getHouseholdUserInfo" - "GoSungrow/iSolarCloud/AppService/getHouseholdWorkOrderInfo" - "GoSungrow/iSolarCloud/AppService/getHouseholdWorkOrderList" - "GoSungrow/iSolarCloud/AppService/getI18nConfigByType" - "GoSungrow/iSolarCloud/AppService/getI18nFileInfo" - "GoSungrow/iSolarCloud/AppService/getI18nInfoByKey" - "GoSungrow/iSolarCloud/AppService/getI18nVersion" - "GoSungrow/iSolarCloud/AppService/getIncomeSettingInfos" - "GoSungrow/iSolarCloud/AppService/getInfoFromAMap" - "GoSungrow/iSolarCloud/AppService/getInfomationFromRedis" - "GoSungrow/iSolarCloud/AppService/getInstallInfoList" - "GoSungrow/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId" - "GoSungrow/iSolarCloud/AppService/getInvertDataList" - "GoSungrow/iSolarCloud/AppService/getInverterDataCount" - "GoSungrow/iSolarCloud/AppService/getInverterProcess" - "GoSungrow/iSolarCloud/AppService/getInverterUuidBytotalId" - "GoSungrow/iSolarCloud/AppService/getIvEchartsData" - "GoSungrow/iSolarCloud/AppService/getIvEchartsDataById" - "GoSungrow/iSolarCloud/AppService/getKpiInfo" - "GoSungrow/iSolarCloud/AppService/getListMiFromHBase" - "GoSungrow/iSolarCloud/AppService/getMapInfo" - "GoSungrow/iSolarCloud/AppService/getMapMiFromHBase" - "GoSungrow/iSolarCloud/AppService/getMenuAndPrivileges" - "GoSungrow/iSolarCloud/AppService/getMicrogridEStoragePsReport" - "GoSungrow/iSolarCloud/AppService/getModuleLogInfo" - "GoSungrow/iSolarCloud/AppService/getModuleLogTaskList" - "GoSungrow/iSolarCloud/AppService/getNationProvJSON" - "GoSungrow/iSolarCloud/AppService/getNeedOpAsynOpRecordList" - "GoSungrow/iSolarCloud/AppService/getNoticeInfo" - "GoSungrow/iSolarCloud/AppService/getNumberOfServiceCalls" - "GoSungrow/iSolarCloud/AppService/getOSSConfig" - "GoSungrow/iSolarCloud/AppService/getOperRuleDetail" - "GoSungrow/iSolarCloud/AppService/getOperateBillFileId" - "GoSungrow/iSolarCloud/AppService/getOperateTicketForDetail" - "GoSungrow/iSolarCloud/AppService/getOrCreateNetEaseUserToken" - "GoSungrow/iSolarCloud/AppService/getOrderDataList" - "GoSungrow/iSolarCloud/AppService/getOrderDataSql2" - "GoSungrow/iSolarCloud/AppService/getOrderDatas" - "GoSungrow/iSolarCloud/AppService/getOrderDetail" - "GoSungrow/iSolarCloud/AppService/getOrderStatistics" - "GoSungrow/iSolarCloud/AppService/getOrgIdNameByUserId" - "GoSungrow/iSolarCloud/AppService/getOrgInfoByDealerOrgCode" - "GoSungrow/iSolarCloud/AppService/getOrgListByName" - "GoSungrow/iSolarCloud/AppService/getOrgListByUserId" - "GoSungrow/iSolarCloud/AppService/getOrgListForUser" - "GoSungrow/iSolarCloud/AppService/getOssObjectStream" - "GoSungrow/iSolarCloud/AppService/getOwnerFaultConfigList" - "GoSungrow/iSolarCloud/AppService/getPListinfoFromMysql" - "GoSungrow/iSolarCloud/AppService/getParamSetTemplate4NewProtocol" - "GoSungrow/iSolarCloud/AppService/getParamSetTemplatePointInfo" - "GoSungrow/iSolarCloud/AppService/getParamterSettingBase" - "GoSungrow/iSolarCloud/AppService/getPhotoInfo" - "GoSungrow/iSolarCloud/AppService/getPlanedOrNotPsList" - "GoSungrow/iSolarCloud/AppService/getPlantReportPDFList" - "GoSungrow/iSolarCloud/AppService/getPowerChargeSettingInfo" - "GoSungrow/iSolarCloud/AppService/getPowerDeviceModelTechList" - "GoSungrow/iSolarCloud/AppService/getPowerDeviceModelTree" - "GoSungrow/iSolarCloud/AppService/getPowerDevicePointInfo" - "GoSungrow/iSolarCloud/AppService/getPowerDevicePointNames" - "GoSungrow/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList" - "GoSungrow/iSolarCloud/AppService/getPowerDeviceSetTaskList" - "GoSungrow/iSolarCloud/AppService/getPowerFormulaFaultAnalyse" - "GoSungrow/iSolarCloud/AppService/getPowerPictureList" - "GoSungrow/iSolarCloud/AppService/getPowerRobotInfoByRobotSn" - "GoSungrow/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId" - "GoSungrow/iSolarCloud/AppService/getPowerRobotSweepStrategy" - "GoSungrow/iSolarCloud/AppService/getPowerRobotSweepStrategyList" - "GoSungrow/iSolarCloud/AppService/getPowerSettingCharges" - "GoSungrow/iSolarCloud/AppService/getPowerSettingHistoryRecords" - "GoSungrow/iSolarCloud/AppService/getPowerStationBasicInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStationData" - "GoSungrow/iSolarCloud/AppService/getPowerStationForHousehold" - "GoSungrow/iSolarCloud/AppService/getPowerStationInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStationPR" - "GoSungrow/iSolarCloud/AppService/getPowerStationTableDataSql" - "GoSungrow/iSolarCloud/AppService/getPowerStationTableDataSqlCount" - "GoSungrow/iSolarCloud/AppService/getPowerStatistics" - "GoSungrow/iSolarCloud/AppService/getPowerTrendDayData" - "GoSungrow/iSolarCloud/AppService/getPrivateCloudValidityPeriod" - "GoSungrow/iSolarCloud/AppService/getProvInfoListByNationCode" - "GoSungrow/iSolarCloud/AppService/getPsAuthKey" - "GoSungrow/iSolarCloud/AppService/getPsCurveInfo" - "GoSungrow/iSolarCloud/AppService/getPsDataSupplementTaskList" - "GoSungrow/iSolarCloud/AppService/getPsDetail" - "GoSungrow/iSolarCloud/AppService/getPsDetailByUserTokens" - "GoSungrow/iSolarCloud/AppService/getPsDetailForSinglePage" - "GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" - "GoSungrow/iSolarCloud/AppService/getPsHealthState" - "GoSungrow/iSolarCloud/AppService/getPsInstallerByPsId" - "GoSungrow/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId" - "GoSungrow/iSolarCloud/AppService/getPsList" - "GoSungrow/iSolarCloud/AppService/getPsListByName" - "GoSungrow/iSolarCloud/AppService/getPsListForPsDataByPsId" - "GoSungrow/iSolarCloud/AppService/getPsListStaticData" - "GoSungrow/iSolarCloud/AppService/getPsReport" - "GoSungrow/iSolarCloud/AppService/getPsUser" - "GoSungrow/iSolarCloud/AppService/getPsWeatherList" - "GoSungrow/iSolarCloud/AppService/getRechargeOrderDetail" - "GoSungrow/iSolarCloud/AppService/getRechargeOrderItemDeviceList" - "GoSungrow/iSolarCloud/AppService/getRechargeOrderList" - "GoSungrow/iSolarCloud/AppService/getRegionalTree" - "GoSungrow/iSolarCloud/AppService/getRemoteParamSettingList" - "GoSungrow/iSolarCloud/AppService/getRemoteUpgradeDeviceList" - "GoSungrow/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails" - "GoSungrow/iSolarCloud/AppService/getRemoteUpgradeSubTasksList" - "GoSungrow/iSolarCloud/AppService/getRemoteUpgradeTaskList" - "GoSungrow/iSolarCloud/AppService/getReportData" - "GoSungrow/iSolarCloud/AppService/getReportEmailConfigInfo" - "GoSungrow/iSolarCloud/AppService/getReportExportColumns" - "GoSungrow/iSolarCloud/AppService/getReportListByUserId" - "GoSungrow/iSolarCloud/AppService/getRobotDynamicCleaningView" - "GoSungrow/iSolarCloud/AppService/getRobotNumAndSweepCapacity" - "GoSungrow/iSolarCloud/AppService/getRuleUnit" - "GoSungrow/iSolarCloud/AppService/getSendReportConfigCron" - "GoSungrow/iSolarCloud/AppService/getSerialNum" - "GoSungrow/iSolarCloud/AppService/getShieldMapConditionList" - "GoSungrow/iSolarCloud/AppService/getSimIdBySnList" - "GoSungrow/iSolarCloud/AppService/getSingleIVData" - "GoSungrow/iSolarCloud/AppService/getSnChangeRecord" - "GoSungrow/iSolarCloud/AppService/getSnConnectionInfo" - "GoSungrow/iSolarCloud/AppService/getStationInfoSql" - "GoSungrow/iSolarCloud/AppService/getSungwsConfigCache" - "GoSungrow/iSolarCloud/AppService/getSungwsGlobalConfigCache" - "GoSungrow/iSolarCloud/AppService/getSweepDevParamSetTemplate" - "GoSungrow/iSolarCloud/AppService/getSweepRobotDevList" - "GoSungrow/iSolarCloud/AppService/getSysMsg" - "GoSungrow/iSolarCloud/AppService/getSysOrgNewList" - "GoSungrow/iSolarCloud/AppService/getSysOrgNewOne" - "GoSungrow/iSolarCloud/AppService/getSysUserById" - "GoSungrow/iSolarCloud/AppService/getTableDataSql" - "GoSungrow/iSolarCloud/AppService/getTableDataSqlCount" - "GoSungrow/iSolarCloud/AppService/getTemplateByInfoType" - "GoSungrow/iSolarCloud/AppService/getTemplateList" - "GoSungrow/iSolarCloud/AppService/getUUIDByUpuuid" - "GoSungrow/iSolarCloud/AppService/getUpTimePoint" - "GoSungrow/iSolarCloud/AppService/getUserById" - "GoSungrow/iSolarCloud/AppService/getUserByInstaller" - "GoSungrow/iSolarCloud/AppService/getUserDevOnlineOffineCount" - "GoSungrow/iSolarCloud/AppService/getUserGDPRAttrs" - "GoSungrow/iSolarCloud/AppService/getUserHavePowerStationCount" - "GoSungrow/iSolarCloud/AppService/getUserInfoByUserAccounts" - "GoSungrow/iSolarCloud/AppService/getUserList" - "GoSungrow/iSolarCloud/AppService/getUserPsOrderList" - "GoSungrow/iSolarCloud/AppService/getValFromHBase" - "GoSungrow/iSolarCloud/AppService/getValidateCode" - "GoSungrow/iSolarCloud/AppService/getValidateCodeAtRegister" - "GoSungrow/iSolarCloud/AppService/getWeatherInfo" - "GoSungrow/iSolarCloud/AppService/getWechatPushConfig" - "GoSungrow/iSolarCloud/AppService/getWorkInfo" - "GoSungrow/iSolarCloud/AppService/groupStringCheck" - "GoSungrow/iSolarCloud/AppService/handleDevByCommunicationSN" - "GoSungrow/iSolarCloud/AppService/householdResetPassBySN" - "GoSungrow/iSolarCloud/AppService/immediatePayment" - "GoSungrow/iSolarCloud/AppService/importExcelData" - "GoSungrow/iSolarCloud/AppService/incomeStatistics" - "GoSungrow/iSolarCloud/AppService/informPush" - "GoSungrow/iSolarCloud/AppService/insertEmgOrgInfo" - "GoSungrow/iSolarCloud/AppService/insightSynDeviceStructure2Cloud" - "GoSungrow/iSolarCloud/AppService/intoDataToHbase" - "GoSungrow/iSolarCloud/AppService/ipLocationQuery" - "GoSungrow/iSolarCloud/AppService/isHave2GSn" - "GoSungrow/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate" - "GoSungrow/iSolarCloud/AppService/judgeIsSettingMan" - "GoSungrow/iSolarCloud/AppService/listOssFiles" - "GoSungrow/iSolarCloud/AppService/loadAreaInfo" - "GoSungrow/iSolarCloud/AppService/loadPowerStation" - "GoSungrow/iSolarCloud/AppService/login" - "GoSungrow/iSolarCloud/AppService/loginByToken" - "GoSungrow/iSolarCloud/AppService/logout" - "GoSungrow/iSolarCloud/AppService/mobilePhoneHasBound" - "GoSungrow/iSolarCloud/AppService/modifiedDeviceInfo" - "GoSungrow/iSolarCloud/AppService/modifyEmgOrgStruc" - "GoSungrow/iSolarCloud/AppService/modifyFaultPlan" - "GoSungrow/iSolarCloud/AppService/modifyOnDutyInfo" - "GoSungrow/iSolarCloud/AppService/modifyPassword" - "GoSungrow/iSolarCloud/AppService/modifyPersonalUnitList" - "GoSungrow/iSolarCloud/AppService/modifyPsUser" - "GoSungrow/iSolarCloud/AppService/moduleLogParamSet" - "GoSungrow/iSolarCloud/AppService/operateOssFile" - "GoSungrow/iSolarCloud/AppService/operationPowerRobotSweepStrategy" - "GoSungrow/iSolarCloud/AppService/orgPowerReport" - "GoSungrow/iSolarCloud/AppService/paramSetTryAgain" - "GoSungrow/iSolarCloud/AppService/paramSetting" - "GoSungrow/iSolarCloud/AppService/planPower" - "GoSungrow/iSolarCloud/AppService/powerDevicePointList" - "GoSungrow/iSolarCloud/AppService/powerTrendChartData" - "GoSungrow/iSolarCloud/AppService/psForcastInfo" - "GoSungrow/iSolarCloud/AppService/psHourPointsValue" - "GoSungrow/iSolarCloud/AppService/queryAllPsIdAndName" - "GoSungrow/iSolarCloud/AppService/queryBatchCreatePsTaskList" - "GoSungrow/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult" - "GoSungrow/iSolarCloud/AppService/queryCardStatusCTCC" - "GoSungrow/iSolarCloud/AppService/queryChildAccountList" - "GoSungrow/iSolarCloud/AppService/queryCompensationRecordData" - "GoSungrow/iSolarCloud/AppService/queryCompensationRecordList" - "GoSungrow/iSolarCloud/AppService/queryComponent" - "GoSungrow/iSolarCloud/AppService/queryComponentTechnicalParam" - "GoSungrow/iSolarCloud/AppService/queryCountryGridAndRelation" - "GoSungrow/iSolarCloud/AppService/queryCountryList" - "GoSungrow/iSolarCloud/AppService/queryCtrlTaskById" - "GoSungrow/iSolarCloud/AppService/queryDeviceInfo" - "GoSungrow/iSolarCloud/AppService/queryDeviceInfoForApp" - "GoSungrow/iSolarCloud/AppService/queryDeviceList" - "GoSungrow/iSolarCloud/AppService/queryDeviceListByUserId" - "GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" - "GoSungrow/iSolarCloud/AppService/queryDeviceModelTechnical" - "GoSungrow/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList" - "GoSungrow/iSolarCloud/AppService/queryDevicePointMinuteDataList" - "GoSungrow/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList" - "GoSungrow/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys" - "GoSungrow/iSolarCloud/AppService/queryDeviceRepairList" - "GoSungrow/iSolarCloud/AppService/queryDeviceTypeInfoList" - "GoSungrow/iSolarCloud/AppService/queryEnvironmentList" - "GoSungrow/iSolarCloud/AppService/queryFaultList" - "GoSungrow/iSolarCloud/AppService/queryFaultPlanDetail" - "GoSungrow/iSolarCloud/AppService/queryFaultRepairSteps" - "GoSungrow/iSolarCloud/AppService/queryFaultTypeAndLevelByCode" - "GoSungrow/iSolarCloud/AppService/queryFaultTypeByDevice" - "GoSungrow/iSolarCloud/AppService/queryFaultTypeByDevicePage" - "GoSungrow/iSolarCloud/AppService/queryFirmwareFilesPage" - "GoSungrow/iSolarCloud/AppService/queryInfotoAlert" - "GoSungrow/iSolarCloud/AppService/queryInverterModelList" - "GoSungrow/iSolarCloud/AppService/queryInverterVersionList" - "GoSungrow/iSolarCloud/AppService/queryM2MCardInfoCMCC" - "GoSungrow/iSolarCloud/AppService/queryM2MCardTermInfoCMCC" - "GoSungrow/iSolarCloud/AppService/queryModelInfoByModelId" - "GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" - "GoSungrow/iSolarCloud/AppService/queryNoticeList" - "GoSungrow/iSolarCloud/AppService/queryNumberOfRenewalReminders" - "GoSungrow/iSolarCloud/AppService/queryOperRules" - "GoSungrow/iSolarCloud/AppService/queryOrderList" - "GoSungrow/iSolarCloud/AppService/queryOrderStep" - "GoSungrow/iSolarCloud/AppService/queryOrgGenerationReport" - "GoSungrow/iSolarCloud/AppService/queryOrgInfoList" - "GoSungrow/iSolarCloud/AppService/queryOrgPowerElecPercent" - "GoSungrow/iSolarCloud/AppService/queryOrgPsCompensationRecordList" - "GoSungrow/iSolarCloud/AppService/queryParamSettingTask" - "GoSungrow/iSolarCloud/AppService/queryPersonalUnitList" - "GoSungrow/iSolarCloud/AppService/queryPointDataTopOne" - "GoSungrow/iSolarCloud/AppService/queryPowerStationInfo" - "GoSungrow/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode" - "GoSungrow/iSolarCloud/AppService/queryPsCompensationRecordList" - "GoSungrow/iSolarCloud/AppService/queryPsDataByDate" - "GoSungrow/iSolarCloud/AppService/queryPsIdList" - "GoSungrow/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode" - "GoSungrow/iSolarCloud/AppService/queryPsNameByPsId" - "GoSungrow/iSolarCloud/AppService/queryPsPrByDate" - "GoSungrow/iSolarCloud/AppService/queryPsProfit" - "GoSungrow/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration" - "GoSungrow/iSolarCloud/AppService/queryPsStructureList" - "GoSungrow/iSolarCloud/AppService/queryPuuidsByCommandTotalId" - "GoSungrow/iSolarCloud/AppService/queryPuuidsByCommandTotalId2" - "GoSungrow/iSolarCloud/AppService/queryRepairRuleList" - "GoSungrow/iSolarCloud/AppService/queryReportListForManagementPage" - "GoSungrow/iSolarCloud/AppService/queryReportMsg" - "GoSungrow/iSolarCloud/AppService/querySharingPs" - "GoSungrow/iSolarCloud/AppService/querySysAdvancedParam" - "GoSungrow/iSolarCloud/AppService/queryTimeBySN" - "GoSungrow/iSolarCloud/AppService/queryTrafficByDateCTCC" - "GoSungrow/iSolarCloud/AppService/queryTrafficCTCC" - "GoSungrow/iSolarCloud/AppService/queryUnitList" - "GoSungrow/iSolarCloud/AppService/queryUnitUuidBytotalId" - "GoSungrow/iSolarCloud/AppService/queryUserBtnPri" - "GoSungrow/iSolarCloud/AppService/queryUserByUserIds" - "GoSungrow/iSolarCloud/AppService/queryUserExtensionAttribute" - "GoSungrow/iSolarCloud/AppService/queryUserForStep" - "GoSungrow/iSolarCloud/AppService/queryUserList" - "GoSungrow/iSolarCloud/AppService/queryUserProcessPri" - "GoSungrow/iSolarCloud/AppService/queryUserWechatBindRel" - "GoSungrow/iSolarCloud/AppService/queryUuidByTotalIdAndUuid" - "GoSungrow/iSolarCloud/AppService/rechargeOrderSetMeal" - "GoSungrow/iSolarCloud/AppService/renewSendReportConfirmEmail" - "GoSungrow/iSolarCloud/AppService/reportList" - "GoSungrow/iSolarCloud/AppService/saveCustomerEmployee" - "GoSungrow/iSolarCloud/AppService/saveDevSimList" - "GoSungrow/iSolarCloud/AppService/saveDeviceAccountBatchData" - "GoSungrow/iSolarCloud/AppService/saveEnviromentIncomeInfos" - "GoSungrow/iSolarCloud/AppService/saveEnvironmentCurve" - "GoSungrow/iSolarCloud/AppService/saveFirmwareFile" - "GoSungrow/iSolarCloud/AppService/saveIncomeSettingInfos" - "GoSungrow/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule" - "GoSungrow/iSolarCloud/AppService/saveParamModel" - "GoSungrow/iSolarCloud/AppService/savePowerCharges" - "GoSungrow/iSolarCloud/AppService/savePowerDevicePoint" - "GoSungrow/iSolarCloud/AppService/savePowerRobotInfo" - "GoSungrow/iSolarCloud/AppService/savePowerRobotSweepAttr" - "GoSungrow/iSolarCloud/AppService/savePowerSettingCharges" - "GoSungrow/iSolarCloud/AppService/savePowerSettingInfo" - "GoSungrow/iSolarCloud/AppService/saveProductionBatchData" - "GoSungrow/iSolarCloud/AppService/saveRechargeOrderObj" - "GoSungrow/iSolarCloud/AppService/saveRechargeOrderOtherInfo" - "GoSungrow/iSolarCloud/AppService/saveRepair" - "GoSungrow/iSolarCloud/AppService/saveReportExportColumns" - "GoSungrow/iSolarCloud/AppService/saveSetParam" - "GoSungrow/iSolarCloud/AppService/saveSysUserMsg" - "GoSungrow/iSolarCloud/AppService/saveTemplate" - "GoSungrow/iSolarCloud/AppService/searchM2MMonthFlowCMCC" - "GoSungrow/iSolarCloud/AppService/selectSysTranslationNames" - "GoSungrow/iSolarCloud/AppService/sendPsTimeZoneInstruction" - "GoSungrow/iSolarCloud/AppService/setUpFormulaFaultAnalyse" - "GoSungrow/iSolarCloud/AppService/setUserGDPRAttrs" - "GoSungrow/iSolarCloud/AppService/settingNotice" - "GoSungrow/iSolarCloud/AppService/shareMyPs" - "GoSungrow/iSolarCloud/AppService/sharePsBySN" - "GoSungrow/iSolarCloud/AppService/showInverterByUnit" - "GoSungrow/iSolarCloud/AppService/showOnlineUsers" - "GoSungrow/iSolarCloud/AppService/showWarning" - "GoSungrow/iSolarCloud/AppService/snIsExist" - "GoSungrow/iSolarCloud/AppService/snsIsExist" - "GoSungrow/iSolarCloud/AppService/speedyAddPowerStation" - "GoSungrow/iSolarCloud/AppService/stationDeviceHistoryDataList" - "GoSungrow/iSolarCloud/AppService/stationUnitsList" - "GoSungrow/iSolarCloud/AppService/stationsDiscreteData" - "GoSungrow/iSolarCloud/AppService/stationsIncomeList" - "GoSungrow/iSolarCloud/AppService/stationsPointReport" - "GoSungrow/iSolarCloud/AppService/stationsYearPlanReport" - "GoSungrow/iSolarCloud/AppService/sureAndImportSelettlementData" - "GoSungrow/iSolarCloud/AppService/sweepDevParamSet" - "GoSungrow/iSolarCloud/AppService/sweepDevRunControl" - "GoSungrow/iSolarCloud/AppService/sweepDevStrategyIssue" - "GoSungrow/iSolarCloud/AppService/sysTimeZoneList" - "GoSungrow/iSolarCloud/AppService/unLockUser" - "GoSungrow/iSolarCloud/AppService/unlockChildAccount" - "GoSungrow/iSolarCloud/AppService/updateCommunicationModuleState" - "GoSungrow/iSolarCloud/AppService/updateDevInstalledPower" - "GoSungrow/iSolarCloud/AppService/updateFault" - "GoSungrow/iSolarCloud/AppService/updateFaultData" - "GoSungrow/iSolarCloud/AppService/updateFaultMsgByFaultCode" - "GoSungrow/iSolarCloud/AppService/updateFaultStatus" - "GoSungrow/iSolarCloud/AppService/updateHouseholdWorkOrder" - "GoSungrow/iSolarCloud/AppService/updateInverterSn2ModuleSn" - "GoSungrow/iSolarCloud/AppService/updateOperateTicketAttachmentId" - "GoSungrow/iSolarCloud/AppService/updateOrderDeviceByCustomerService" - "GoSungrow/iSolarCloud/AppService/updateOwnerFaultConfig" - "GoSungrow/iSolarCloud/AppService/updateParamSettingSysMsg" - "GoSungrow/iSolarCloud/AppService/updatePlatformLevelFaultLevel" - "GoSungrow/iSolarCloud/AppService/updatePowerDevicePoint" - "GoSungrow/iSolarCloud/AppService/updatePowerRobotInfo" - "GoSungrow/iSolarCloud/AppService/updatePowerRobotSweepAttr" - "GoSungrow/iSolarCloud/AppService/updatePowerStationForHousehold" - "GoSungrow/iSolarCloud/AppService/updatePowerStationInfo" - "GoSungrow/iSolarCloud/AppService/updatePowerUserInfo" - "GoSungrow/iSolarCloud/AppService/updateReportConfigByEmailAddr" - "GoSungrow/iSolarCloud/AppService/updateShareAttr" - "GoSungrow/iSolarCloud/AppService/updateSnIsSureFlag" - "GoSungrow/iSolarCloud/AppService/updateStationPics" - "GoSungrow/iSolarCloud/AppService/updateSysAdvancedParam" - "GoSungrow/iSolarCloud/AppService/updateSysOrgNew" - "GoSungrow/iSolarCloud/AppService/updateTemplate" - "GoSungrow/iSolarCloud/AppService/updateUinfoNetEaseUser" - "GoSungrow/iSolarCloud/AppService/updateUserExtensionAttribute" - "GoSungrow/iSolarCloud/AppService/updateUserLanguage" - "GoSungrow/iSolarCloud/AppService/updateUserPosition" - "GoSungrow/iSolarCloud/AppService/updateUserUpOrg" - "GoSungrow/iSolarCloud/AppService/upgrade" - "GoSungrow/iSolarCloud/AppService/upgrate" - "GoSungrow/iSolarCloud/AppService/uploadFileToOss" - "GoSungrow/iSolarCloud/AppService/userAgreeGdprProtocol" - "GoSungrow/iSolarCloud/AppService/userInfoUniqueCheck" - "GoSungrow/iSolarCloud/AppService/userMailHasBound" - "GoSungrow/iSolarCloud/AppService/userRegister" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/acceptPsSharing" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/activateEmail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addDeviceRepair" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addDeviceToStructureForHousehold" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addFault" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addFaultOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addFaultPlan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addFaultRepairSteps" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addHouseholdEvaluation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addHouseholdLeaveMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addHouseholdOpinionFeedback" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addHouseholdWorkOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addOnDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addOperRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addOrDelPsStructure" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addOrderStep" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addPowerStationForHousehold" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addReportConfigEmail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addSysAdvancedParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/addSysOrgNew" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/aliPayAppTest" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/auditOperRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchAddStationBySn" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchImportSN" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchInsertUserAndOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchProcessPlantReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchUpdateDeviceSim" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/boundMobilePhone" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/boundUserMail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/caculateDeviceInputDiscrete" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/calculateDeviceDiscrete" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/calculateInitialCompensationData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cancelDeliverMail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cancelOrderScan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cancelParamSetTask" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cancelPsSharing" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cancelRechargeOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/changRechargeOrderToCancel" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/changeHouseholdUser2Installer" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/changeRemoteParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkDealerOrgCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkDevSnIsBelongsToUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkInverterResult" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkIsCanDoParamSet" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkIsIvScan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkOssObjectExist" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkServiceIsConnect" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkTechnicalParameters" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUnitStatus" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUpRechargeDevicePaying" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserAccountUnique" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserAccountUniqueAll" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserInfoUnique" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserIsExist" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserListIsExist" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/checkUserPassword" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/cloudDeploymentRecord" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/comfirmParamModel" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/communicationModuleDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/compareValidateCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/componentInfo2Cloud" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/confirmFault" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/confirmIvFault" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/confirmReportConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/createAppkeyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/createRenewInvoice" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealCommandReply" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealDeletePsFailPsDelete" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealFailRemoteUpgradeTasks" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealFaultOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealGroupStringDisableOrEnable" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealParamSettingAfterComplete" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealPsDataSupplement" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealPsReportEmailSend" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealRemoteUpgrade" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealSnElectrifyCheck" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealSysDeviceSimFlowInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/dealSysDeviceSimInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/definiteTimeDealSnExpRemind" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/definiteTimeDealSnStatus" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/delDeviceRepair" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/delOperRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/delayCallApiResidueTimes" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteComponent" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteCustomerEmployee" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteDeviceAccount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteDeviceSimById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteElectricitySettlementData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteFaultPlan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteFirmwareFiles" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteHouseholdEvaluation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteHouseholdLeaveMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteHouseholdWorkOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteInverterSnInChnnl" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteModuleLog" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteOnDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteOperateBillFile" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteOssObject" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deletePowerDevicePointById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deletePowerPicture" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deletePowerRobotSweepStrategy" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteProductionData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deletePs" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteRechargeOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteRegularlyConnectionInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteReportConfigEmailAddr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteSysAdvancedParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteSysOrgNew" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deleteUserInfoAllByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deviceInputDiscreteDeleteTime" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deviceInputDiscreteGetTime" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deviceInputDiscreteInsertTime" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deviceInputDiscreteUpdateTime" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/devicePointsDataFromMySql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/deviceReplace" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/editDeviceRepair" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/editOperRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/energyPovertyAlleviation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/energyTrend" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/exportParamSettingValPDF" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/exportPlantReportPDF" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/faultAutoClose" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/faultCloseRemindOrderHandler" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findCodeValueList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findEmgOrgInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findEnvironmentInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findFromHbaseAndRedis" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findInfoByuuid" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findLossAnalysisList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findOnDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findSingleStationPR" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findUserPassword" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/genTLSUserSigByUserAccount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/generateRandomPassword" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAPIServiceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAccessedPermission" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAllDeviceByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAllPowerDeviceSetName" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAllPsIdByOrgIds" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAllUserRemindCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAndOutletsAndUnit" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getApiCallsForAppkeys" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAreaInfoCodeByCounty" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAreaList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getAutoCreatePowerStation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getBackReadValue" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getBatchNewestPointData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCallApiResidueTimes" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getChangedPsListByTime" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getChnnlListByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCloudList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCloudServiceMappingConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCommunicationDeviceConfigInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCommunicationModuleMonitorData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getComponentModelFactory" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getConfigList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCountDown" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCountryServiceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCounty" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCustomerEmployee" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getCustomerList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDataFromHBase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDataFromHbaseByRowKey" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevInstalledPowerByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevRecord" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevRunRecordList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevSimByList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevSimList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceAccountById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceFaultStatisticsData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceModelInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevicePointMinuteDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevicePoints" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDevicePropertys" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceRepairDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceTechBranchCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceTypeInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDstInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getElectricitySettlementData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getElectricitySettlementDetailData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getEncryptPublicKey" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultMsgByFaultCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultMsgListWithYYYYMM" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFaultPlanList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFileOperationRecordOne" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getFormulaFaultAnalyseList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getGroupStringCheckResult" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getGroupStringCheckRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHisData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHistoryInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdEvaluation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdLeaveMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdOpinionFeedback" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdPsInstallerByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdUserInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdWorkOrderInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdWorkOrderList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getI18nConfigByType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getI18nFileInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getI18nInfoByKey" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getI18nVersion" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getIncomeSettingInfos" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInfoFromAMap" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInfomationFromRedis" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInstallInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInvertDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInverterDataCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInverterProcess" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getInverterUuidBytotalId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getIvEchartsData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getIvEchartsDataById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getKpiInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getListMiFromHBase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getMapInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getMapMiFromHBase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getMenuAndPrivileges" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getMicrogridEStoragePsReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getModuleLogInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getModuleLogTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getNationProvJSON" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getNeedOpAsynOpRecordList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getNoticeInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getNumberOfServiceCalls" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOSSConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOperRuleDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOperateBillFileId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOperateTicketForDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrCreateNetEaseUserToken" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrderDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrderDataSql2" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrderDatas" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrderDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrderStatistics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrgIdNameByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrgInfoByDealerOrgCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrgListByName" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrgListByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOrgListForUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOssObjectStream" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getOwnerFaultConfigList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPListinfoFromMysql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getParamSetTemplate4NewProtocol" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getParamSetTemplatePointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getParamterSettingBase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPhotoInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPlanedOrNotPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPlantReportPDFList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerChargeSettingInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDeviceModelTechList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDeviceModelTree" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDevicePointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDevicePointNames" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDeviceSetTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerFormulaFaultAnalyse" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerPictureList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerRobotInfoByRobotSn" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerRobotSweepStrategy" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerRobotSweepStrategyList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerSettingCharges" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerSettingHistoryRecords" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationBasicInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationForHousehold" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationPR" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationTableDataSql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationTableDataSqlCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStatistics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerTrendDayData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPrivateCloudValidityPeriod" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getProvInfoListByNationCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsAuthKey" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsCurveInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDataSupplementTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailByUserTokens" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailForSinglePage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsHealthState" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsInstallerByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsListByName" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsListForPsDataByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsListStaticData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsWeatherList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRechargeOrderDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRechargeOrderItemDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRechargeOrderList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRegionalTree" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteParamSettingList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteUpgradeDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteUpgradeSubTasksList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteUpgradeTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getReportData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getReportEmailConfigInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getReportExportColumns" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getReportListByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRobotDynamicCleaningView" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRobotNumAndSweepCapacity" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRuleUnit" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSendReportConfigCron" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSerialNum" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getShieldMapConditionList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSimIdBySnList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSingleIVData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSnChangeRecord" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSnConnectionInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getStationInfoSql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSungwsConfigCache" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSungwsGlobalConfigCache" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSweepDevParamSetTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSweepRobotDevList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSysMsg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSysOrgNewList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSysOrgNewOne" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getSysUserById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getTableDataSql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getTableDataSqlCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getTemplateByInfoType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getTemplateList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUUIDByUpuuid" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUpTimePoint" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserByInstaller" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserDevOnlineOffineCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserGDPRAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserHavePowerStationCount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserInfoByUserAccounts" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserPsOrderList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getValFromHBase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getValidateCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getValidateCodeAtRegister" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getWeatherInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getWechatPushConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getWorkInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/groupStringCheck" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/handleDevByCommunicationSN" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/householdResetPassBySN" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/immediatePayment" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/importExcelData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/incomeStatistics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/informPush" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/insertEmgOrgInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/insightSynDeviceStructure2Cloud" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/intoDataToHbase" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/ipLocationQuery" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/isHave2GSn" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/judgeIsSettingMan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/listOssFiles" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/loadAreaInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/loadPowerStation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/login" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/loginByToken" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/logout" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/mobilePhoneHasBound" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifiedDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyEmgOrgStruc" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyFaultPlan" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyOnDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyPassword" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyPersonalUnitList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/modifyPsUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/moduleLogParamSet" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/operateOssFile" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/operationPowerRobotSweepStrategy" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/orgPowerReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/paramSetTryAgain" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/paramSetting" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/planPower" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/powerDevicePointList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/powerTrendChartData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/psForcastInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/psHourPointsValue" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryAllPsIdAndName" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryBatchCreatePsTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCardStatusCTCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryChildAccountList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCompensationRecordData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCompensationRecordList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryComponent" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryComponentTechnicalParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCountryGridAndRelation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCountryList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryCtrlTaskById" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceInfoForApp" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceListByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceModelTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDevicePointMinuteDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceRepairList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceTypeInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryEnvironmentList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultPlanDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultRepairSteps" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultTypeAndLevelByCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultTypeByDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFaultTypeByDevicePage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryFirmwareFilesPage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryInfotoAlert" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryInverterModelList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryInverterVersionList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryM2MCardInfoCMCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryM2MCardTermInfoCMCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryModelInfoByModelId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryNoticeList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryNumberOfRenewalReminders" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOperRules" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrderList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrderStep" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrgGenerationReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrgInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrgPowerElecPercent" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryOrgPsCompensationRecordList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryParamSettingTask" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPersonalUnitList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPointDataTopOne" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsCompensationRecordList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsDataByDate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsIdList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsNameByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsPrByDate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsProfit" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsStructureList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPuuidsByCommandTotalId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPuuidsByCommandTotalId2" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryRepairRuleList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryReportListForManagementPage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryReportMsg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/querySharingPs" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/querySysAdvancedParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryTimeBySN" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryTrafficByDateCTCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryTrafficCTCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUnitList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUnitUuidBytotalId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserBtnPri" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserByUserIds" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserExtensionAttribute" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserForStep" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserProcessPri" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUserWechatBindRel" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUuidByTotalIdAndUuid" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/rechargeOrderSetMeal" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/renewSendReportConfirmEmail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/reportList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveCustomerEmployee" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveDevSimList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveDeviceAccountBatchData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveEnviromentIncomeInfos" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveEnvironmentCurve" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveFirmwareFile" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveIncomeSettingInfos" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveParamModel" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerCharges" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerDevicePoint" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerRobotInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerRobotSweepAttr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerSettingCharges" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/savePowerSettingInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveProductionBatchData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveRechargeOrderObj" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveRechargeOrderOtherInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveRepair" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveReportExportColumns" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveSetParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveSysUserMsg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/saveTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/searchM2MMonthFlowCMCC" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/selectSysTranslationNames" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sendPsTimeZoneInstruction" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/setUpFormulaFaultAnalyse" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/setUserGDPRAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/settingNotice" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/shareMyPs" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sharePsBySN" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/showInverterByUnit" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/showOnlineUsers" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/showWarning" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/snIsExist" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/snsIsExist" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/speedyAddPowerStation" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationDeviceHistoryDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationUnitsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationsDiscreteData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationsIncomeList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationsPointReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/stationsYearPlanReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sureAndImportSelettlementData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sweepDevParamSet" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sweepDevRunControl" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sweepDevStrategyIssue" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/sysTimeZoneList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/unLockUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/unlockChildAccount" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateCommunicationModuleState" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateDevInstalledPower" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateFault" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateFaultData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateFaultMsgByFaultCode" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateFaultStatus" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateHouseholdWorkOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateInverterSn2ModuleSn" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateOperateTicketAttachmentId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateOrderDeviceByCustomerService" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateOwnerFaultConfig" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateParamSettingSysMsg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePlatformLevelFaultLevel" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerDevicePoint" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerRobotInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerRobotSweepAttr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerStationForHousehold" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updatePowerUserInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateReportConfigByEmailAddr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateShareAttr" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateSnIsSureFlag" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateStationPics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateSysAdvancedParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateSysOrgNew" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateUinfoNetEaseUser" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateUserExtensionAttribute" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateUserLanguage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateUserPosition" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/updateUserUpOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/upgrade" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/upgrate" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/uploadFileToOss" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/userAgreeGdprProtocol" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/userInfoUniqueCheck" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/userMailHasBound" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/userRegister" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) var _ api.Area = (*Area)(nil) diff --git a/iSolarCloud/AppService/sureAndImportSelettlementData/data.go b/iSolarCloud/AppService/sureAndImportSelettlementData/data.go index e3c641b1a..915138e52 100644 --- a/iSolarCloud/AppService/sureAndImportSelettlementData/data.go +++ b/iSolarCloud/AppService/sureAndImportSelettlementData/data.go @@ -1,11 +1,12 @@ package sureAndImportSelettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/sureAndImportSelettlementData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go b/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go index fe2b0a448..4c6ce8b91 100644 --- a/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go +++ b/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go @@ -5,9 +5,9 @@ package sureAndImportSelettlementData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sweepDevParamSet/data.go b/iSolarCloud/AppService/sweepDevParamSet/data.go index 681bf9008..cf80ad646 100644 --- a/iSolarCloud/AppService/sweepDevParamSet/data.go +++ b/iSolarCloud/AppService/sweepDevParamSet/data.go @@ -1,11 +1,12 @@ package sweepDevParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/sweepDevParamSet" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sweepDevParamSet/struct.go b/iSolarCloud/AppService/sweepDevParamSet/struct.go index a1a49f5f7..a2070e47c 100644 --- a/iSolarCloud/AppService/sweepDevParamSet/struct.go +++ b/iSolarCloud/AppService/sweepDevParamSet/struct.go @@ -5,9 +5,9 @@ package sweepDevParamSet import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sweepDevRunControl/data.go b/iSolarCloud/AppService/sweepDevRunControl/data.go index be95884bb..f501e81d0 100644 --- a/iSolarCloud/AppService/sweepDevRunControl/data.go +++ b/iSolarCloud/AppService/sweepDevRunControl/data.go @@ -1,11 +1,12 @@ package sweepDevRunControl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/sweepDevRunControl" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sweepDevRunControl/struct.go b/iSolarCloud/AppService/sweepDevRunControl/struct.go index 179a80bc2..7912b1118 100644 --- a/iSolarCloud/AppService/sweepDevRunControl/struct.go +++ b/iSolarCloud/AppService/sweepDevRunControl/struct.go @@ -5,9 +5,9 @@ package sweepDevRunControl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sweepDevStrategyIssue/data.go b/iSolarCloud/AppService/sweepDevStrategyIssue/data.go index 268cb8d5d..cc97b1a18 100644 --- a/iSolarCloud/AppService/sweepDevStrategyIssue/data.go +++ b/iSolarCloud/AppService/sweepDevStrategyIssue/data.go @@ -1,11 +1,12 @@ package sweepDevStrategyIssue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/sweepDevStrategyIssue" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go b/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go index 037ac6d0f..30c3e315a 100644 --- a/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go +++ b/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go @@ -5,9 +5,9 @@ package sweepDevStrategyIssue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/sysTimeZoneList/data.go b/iSolarCloud/AppService/sysTimeZoneList/data.go index 5a1adbeca..da33e3bcc 100644 --- a/iSolarCloud/AppService/sysTimeZoneList/data.go +++ b/iSolarCloud/AppService/sysTimeZoneList/data.go @@ -1,11 +1,12 @@ package sysTimeZoneList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/sysTimeZoneList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/sysTimeZoneList/struct.go b/iSolarCloud/AppService/sysTimeZoneList/struct.go index 3e3408864..9e6972c07 100644 --- a/iSolarCloud/AppService/sysTimeZoneList/struct.go +++ b/iSolarCloud/AppService/sysTimeZoneList/struct.go @@ -5,9 +5,9 @@ package sysTimeZoneList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/unLockUser/data.go b/iSolarCloud/AppService/unLockUser/data.go index c667fcc39..788c043d7 100644 --- a/iSolarCloud/AppService/unLockUser/data.go +++ b/iSolarCloud/AppService/unLockUser/data.go @@ -1,11 +1,12 @@ package unLockUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/unLockUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/unLockUser/struct.go b/iSolarCloud/AppService/unLockUser/struct.go index d133f3f7a..5a9a81c48 100644 --- a/iSolarCloud/AppService/unLockUser/struct.go +++ b/iSolarCloud/AppService/unLockUser/struct.go @@ -5,9 +5,9 @@ package unLockUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/unlockChildAccount/data.go b/iSolarCloud/AppService/unlockChildAccount/data.go index eaf0ac7df..d2157671d 100644 --- a/iSolarCloud/AppService/unlockChildAccount/data.go +++ b/iSolarCloud/AppService/unlockChildAccount/data.go @@ -1,11 +1,12 @@ package unlockChildAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/unlockChildAccount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/unlockChildAccount/struct.go b/iSolarCloud/AppService/unlockChildAccount/struct.go index 06165a3b8..0b9c9e2f3 100644 --- a/iSolarCloud/AppService/unlockChildAccount/struct.go +++ b/iSolarCloud/AppService/unlockChildAccount/struct.go @@ -5,9 +5,9 @@ package unlockChildAccount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateCommunicationModuleState/data.go b/iSolarCloud/AppService/updateCommunicationModuleState/data.go index 37e2fa009..73c569ce7 100644 --- a/iSolarCloud/AppService/updateCommunicationModuleState/data.go +++ b/iSolarCloud/AppService/updateCommunicationModuleState/data.go @@ -1,11 +1,12 @@ package updateCommunicationModuleState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateCommunicationModuleState" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateCommunicationModuleState/struct.go b/iSolarCloud/AppService/updateCommunicationModuleState/struct.go index fdae73c38..96f14a57d 100644 --- a/iSolarCloud/AppService/updateCommunicationModuleState/struct.go +++ b/iSolarCloud/AppService/updateCommunicationModuleState/struct.go @@ -5,9 +5,9 @@ package updateCommunicationModuleState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateDevInstalledPower/data.go b/iSolarCloud/AppService/updateDevInstalledPower/data.go index 79dc99a4b..106340710 100644 --- a/iSolarCloud/AppService/updateDevInstalledPower/data.go +++ b/iSolarCloud/AppService/updateDevInstalledPower/data.go @@ -1,11 +1,12 @@ package updateDevInstalledPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateDevInstalledPower" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateDevInstalledPower/struct.go b/iSolarCloud/AppService/updateDevInstalledPower/struct.go index aa360b6ec..a6ee5ac47 100644 --- a/iSolarCloud/AppService/updateDevInstalledPower/struct.go +++ b/iSolarCloud/AppService/updateDevInstalledPower/struct.go @@ -5,9 +5,9 @@ package updateDevInstalledPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateFault/data.go b/iSolarCloud/AppService/updateFault/data.go index 236c6df89..b76793dc0 100644 --- a/iSolarCloud/AppService/updateFault/data.go +++ b/iSolarCloud/AppService/updateFault/data.go @@ -1,11 +1,12 @@ package updateFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateFaultStatus" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateFault/struct.go b/iSolarCloud/AppService/updateFault/struct.go index 3d8192452..536a2dc1e 100644 --- a/iSolarCloud/AppService/updateFault/struct.go +++ b/iSolarCloud/AppService/updateFault/struct.go @@ -5,9 +5,9 @@ package updateFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateFaultData/data.go b/iSolarCloud/AppService/updateFaultData/data.go index 4f217e1ec..cbe205067 100644 --- a/iSolarCloud/AppService/updateFaultData/data.go +++ b/iSolarCloud/AppService/updateFaultData/data.go @@ -1,11 +1,12 @@ package updateFaultData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateFaultData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateFaultData/struct.go b/iSolarCloud/AppService/updateFaultData/struct.go index 1dbd933b3..1f194cbc5 100644 --- a/iSolarCloud/AppService/updateFaultData/struct.go +++ b/iSolarCloud/AppService/updateFaultData/struct.go @@ -5,9 +5,9 @@ package updateFaultData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go b/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go index e838806cb..dd77ca6e9 100644 --- a/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go +++ b/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go @@ -1,11 +1,12 @@ package updateFaultMsgByFaultCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateFaultMsgByFaultCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go b/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go index 09ad4711a..39abab022 100644 --- a/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go +++ b/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go @@ -5,9 +5,9 @@ package updateFaultMsgByFaultCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateFaultStatus/data.go b/iSolarCloud/AppService/updateFaultStatus/data.go index b5c3612aa..69a520bfb 100644 --- a/iSolarCloud/AppService/updateFaultStatus/data.go +++ b/iSolarCloud/AppService/updateFaultStatus/data.go @@ -1,11 +1,12 @@ package updateFaultStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateFaultStatus" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateFaultStatus/struct.go b/iSolarCloud/AppService/updateFaultStatus/struct.go index efef84c49..2c637fd31 100644 --- a/iSolarCloud/AppService/updateFaultStatus/struct.go +++ b/iSolarCloud/AppService/updateFaultStatus/struct.go @@ -5,9 +5,9 @@ package updateFaultStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go b/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go index af57d8692..f8dbb888b 100644 --- a/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go +++ b/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go @@ -1,11 +1,12 @@ package updateHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateHouseholdWorkOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go index d33571fad..dcd32246c 100644 --- a/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go +++ b/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go @@ -5,9 +5,9 @@ package updateHouseholdWorkOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go b/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go index a8c47c009..ba251e00e 100644 --- a/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go +++ b/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go @@ -1,11 +1,12 @@ package updateInverterSn2ModuleSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/updateInverterSn2ModuleSn" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go b/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go index 8e7e6429c..363c38fce 100644 --- a/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go +++ b/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go @@ -5,9 +5,9 @@ package updateInverterSn2ModuleSn import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go b/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go index 290d31e7d..940475afa 100644 --- a/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go +++ b/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go @@ -1,11 +1,12 @@ package updateOperateTicketAttachmentId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateOperateTicketAttachmentId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go b/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go index 9d81a4e4b..88fa257b9 100644 --- a/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go +++ b/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go @@ -5,9 +5,9 @@ package updateOperateTicketAttachmentId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go index 887d76a63..2ee815847 100644 --- a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go +++ b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go @@ -1,11 +1,12 @@ package updateOrderDeviceByCustomerService import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/onlinepay/updateOrderDeviceByCustomerService" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go index c33c509ce..ebf891719 100644 --- a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go +++ b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go @@ -5,9 +5,9 @@ package updateOrderDeviceByCustomerService import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateOwnerFaultConfig/data.go b/iSolarCloud/AppService/updateOwnerFaultConfig/data.go index e98618056..ebba093f9 100644 --- a/iSolarCloud/AppService/updateOwnerFaultConfig/data.go +++ b/iSolarCloud/AppService/updateOwnerFaultConfig/data.go @@ -1,11 +1,12 @@ package updateOwnerFaultConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateOwnerFaultConfig" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go b/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go index f94e9409c..72ec51dfa 100644 --- a/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go +++ b/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go @@ -5,9 +5,9 @@ package updateOwnerFaultConfig import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateParamSettingSysMsg/data.go b/iSolarCloud/AppService/updateParamSettingSysMsg/data.go index 525ef19c0..8ec9283d6 100644 --- a/iSolarCloud/AppService/updateParamSettingSysMsg/data.go +++ b/iSolarCloud/AppService/updateParamSettingSysMsg/data.go @@ -1,11 +1,12 @@ package updateParamSettingSysMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateParamSettingSysMsg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go b/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go index cbcfb12df..49199b125 100644 --- a/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go +++ b/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go @@ -5,9 +5,9 @@ package updateParamSettingSysMsg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go index 27ce39b74..3d7647f85 100644 --- a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go +++ b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go @@ -1,11 +1,12 @@ package updatePlatformLevelFaultLevel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updatePlatformLevelFaultLevel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go index 9ee4f2808..afbc038a7 100644 --- a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go +++ b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go @@ -5,9 +5,9 @@ package updatePlatformLevelFaultLevel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerDevicePoint/data.go b/iSolarCloud/AppService/updatePowerDevicePoint/data.go index 55089f751..6ddb51691 100644 --- a/iSolarCloud/AppService/updatePowerDevicePoint/data.go +++ b/iSolarCloud/AppService/updatePowerDevicePoint/data.go @@ -1,11 +1,12 @@ package updatePowerDevicePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/updatePowerDevicePoint" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerDevicePoint/struct.go b/iSolarCloud/AppService/updatePowerDevicePoint/struct.go index 0f5efcb65..ed0a41eb7 100644 --- a/iSolarCloud/AppService/updatePowerDevicePoint/struct.go +++ b/iSolarCloud/AppService/updatePowerDevicePoint/struct.go @@ -5,9 +5,9 @@ package updatePowerDevicePoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerRobotInfo/data.go b/iSolarCloud/AppService/updatePowerRobotInfo/data.go index e0daa8ca4..7704a6d7e 100644 --- a/iSolarCloud/AppService/updatePowerRobotInfo/data.go +++ b/iSolarCloud/AppService/updatePowerRobotInfo/data.go @@ -1,11 +1,12 @@ package updatePowerRobotInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updatePowerRobotInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerRobotInfo/struct.go b/iSolarCloud/AppService/updatePowerRobotInfo/struct.go index 9997a6339..0a8d5f4a7 100644 --- a/iSolarCloud/AppService/updatePowerRobotInfo/struct.go +++ b/iSolarCloud/AppService/updatePowerRobotInfo/struct.go @@ -5,9 +5,9 @@ package updatePowerRobotInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go b/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go index ccd94c6cd..6a313cf22 100644 --- a/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go +++ b/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go @@ -1,11 +1,12 @@ package updatePowerRobotSweepAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updatePowerRobotSweepAttr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go b/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go index d70a6c3f1..1170d3995 100644 --- a/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go +++ b/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go @@ -5,9 +5,9 @@ package updatePowerRobotSweepAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerStationForHousehold/data.go b/iSolarCloud/AppService/updatePowerStationForHousehold/data.go index 08c09efb7..fc5c3404a 100644 --- a/iSolarCloud/AppService/updatePowerStationForHousehold/data.go +++ b/iSolarCloud/AppService/updatePowerStationForHousehold/data.go @@ -1,11 +1,12 @@ package updatePowerStationForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/updatePowerStationForHousehold" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go b/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go index d4b47e8fb..db7261398 100644 --- a/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go +++ b/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go @@ -5,9 +5,9 @@ package updatePowerStationForHousehold import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerStationInfo/data.go b/iSolarCloud/AppService/updatePowerStationInfo/data.go index 568fa0641..b9f01fd5e 100644 --- a/iSolarCloud/AppService/updatePowerStationInfo/data.go +++ b/iSolarCloud/AppService/updatePowerStationInfo/data.go @@ -1,11 +1,12 @@ package updatePowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/updatePowerStationInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerStationInfo/struct.go b/iSolarCloud/AppService/updatePowerStationInfo/struct.go index e5e3bb917..734d8ef3c 100644 --- a/iSolarCloud/AppService/updatePowerStationInfo/struct.go +++ b/iSolarCloud/AppService/updatePowerStationInfo/struct.go @@ -5,9 +5,9 @@ package updatePowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updatePowerUserInfo/data.go b/iSolarCloud/AppService/updatePowerUserInfo/data.go index 39731ae7b..9aaf88a8f 100644 --- a/iSolarCloud/AppService/updatePowerUserInfo/data.go +++ b/iSolarCloud/AppService/updatePowerUserInfo/data.go @@ -1,11 +1,12 @@ package updatePowerUserInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updatePowerUserInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updatePowerUserInfo/struct.go b/iSolarCloud/AppService/updatePowerUserInfo/struct.go index 44ee59c9d..b7d94c1b2 100644 --- a/iSolarCloud/AppService/updatePowerUserInfo/struct.go +++ b/iSolarCloud/AppService/updatePowerUserInfo/struct.go @@ -5,9 +5,9 @@ package updatePowerUserInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go b/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go index cfb432154..799ae3cf5 100644 --- a/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go +++ b/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go @@ -1,11 +1,12 @@ package updateReportConfigByEmailAddr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/updateReportConfigByEmailAddr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go b/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go index 007f36640..2b661895c 100644 --- a/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go +++ b/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go @@ -5,9 +5,9 @@ package updateReportConfigByEmailAddr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateShareAttr/data.go b/iSolarCloud/AppService/updateShareAttr/data.go index de752aa73..7e70d6181 100644 --- a/iSolarCloud/AppService/updateShareAttr/data.go +++ b/iSolarCloud/AppService/updateShareAttr/data.go @@ -1,11 +1,12 @@ package updateShareAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/updateShareAttr" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateShareAttr/struct.go b/iSolarCloud/AppService/updateShareAttr/struct.go index 5c3468d45..28f60c8f0 100644 --- a/iSolarCloud/AppService/updateShareAttr/struct.go +++ b/iSolarCloud/AppService/updateShareAttr/struct.go @@ -5,9 +5,9 @@ package updateShareAttr import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateSnIsSureFlag/data.go b/iSolarCloud/AppService/updateSnIsSureFlag/data.go index fd1ae1428..3471221e9 100644 --- a/iSolarCloud/AppService/updateSnIsSureFlag/data.go +++ b/iSolarCloud/AppService/updateSnIsSureFlag/data.go @@ -1,11 +1,12 @@ package updateSnIsSureFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/devDataHandleService/updateSnIsSureFlag" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateSnIsSureFlag/struct.go b/iSolarCloud/AppService/updateSnIsSureFlag/struct.go index 52e920ff8..5b06b3e9f 100644 --- a/iSolarCloud/AppService/updateSnIsSureFlag/struct.go +++ b/iSolarCloud/AppService/updateSnIsSureFlag/struct.go @@ -5,9 +5,9 @@ package updateSnIsSureFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateStationPics/data.go b/iSolarCloud/AppService/updateStationPics/data.go index d93d610ea..9d976640c 100644 --- a/iSolarCloud/AppService/updateStationPics/data.go +++ b/iSolarCloud/AppService/updateStationPics/data.go @@ -1,11 +1,12 @@ package updateStationPics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/updateStationPics" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateStationPics/struct.go b/iSolarCloud/AppService/updateStationPics/struct.go index 034ca35da..748289f2e 100644 --- a/iSolarCloud/AppService/updateStationPics/struct.go +++ b/iSolarCloud/AppService/updateStationPics/struct.go @@ -5,9 +5,9 @@ package updateStationPics import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateSysAdvancedParam/data.go b/iSolarCloud/AppService/updateSysAdvancedParam/data.go index ed17b02ca..067b9fdf5 100644 --- a/iSolarCloud/AppService/updateSysAdvancedParam/data.go +++ b/iSolarCloud/AppService/updateSysAdvancedParam/data.go @@ -1,11 +1,12 @@ package updateSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateSysAdvancedParam" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateSysAdvancedParam/struct.go b/iSolarCloud/AppService/updateSysAdvancedParam/struct.go index edd9f5721..0c7291f7a 100644 --- a/iSolarCloud/AppService/updateSysAdvancedParam/struct.go +++ b/iSolarCloud/AppService/updateSysAdvancedParam/struct.go @@ -5,9 +5,9 @@ package updateSysAdvancedParam import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateSysOrgNew/data.go b/iSolarCloud/AppService/updateSysOrgNew/data.go index a42ea7b8c..7f184b6dc 100644 --- a/iSolarCloud/AppService/updateSysOrgNew/data.go +++ b/iSolarCloud/AppService/updateSysOrgNew/data.go @@ -1,11 +1,12 @@ package updateSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/updateSysOrgNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateSysOrgNew/struct.go b/iSolarCloud/AppService/updateSysOrgNew/struct.go index 8603f6fe0..8b9f8a141 100644 --- a/iSolarCloud/AppService/updateSysOrgNew/struct.go +++ b/iSolarCloud/AppService/updateSysOrgNew/struct.go @@ -5,9 +5,9 @@ package updateSysOrgNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateTemplate/data.go b/iSolarCloud/AppService/updateTemplate/data.go index af4d82ba1..84799a348 100644 --- a/iSolarCloud/AppService/updateTemplate/data.go +++ b/iSolarCloud/AppService/updateTemplate/data.go @@ -1,11 +1,12 @@ package updateTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateDataCurveTemplate" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateTemplate/struct.go b/iSolarCloud/AppService/updateTemplate/struct.go index b97343625..d57da415b 100644 --- a/iSolarCloud/AppService/updateTemplate/struct.go +++ b/iSolarCloud/AppService/updateTemplate/struct.go @@ -5,9 +5,9 @@ package updateTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go b/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go index 19f6e4696..dcfc75e97 100644 --- a/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go +++ b/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go @@ -1,11 +1,12 @@ package updateUinfoNetEaseUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updateUinfoNetEaseUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go b/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go index fbda9ef21..8319655f3 100644 --- a/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go +++ b/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go @@ -5,9 +5,9 @@ package updateUinfoNetEaseUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateUserExtensionAttribute/data.go b/iSolarCloud/AppService/updateUserExtensionAttribute/data.go index 201f2a9e8..ff228b76a 100644 --- a/iSolarCloud/AppService/updateUserExtensionAttribute/data.go +++ b/iSolarCloud/AppService/updateUserExtensionAttribute/data.go @@ -1,11 +1,12 @@ package updateUserExtensionAttribute import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updateUserExtensionAttribute" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go b/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go index 748110fb1..d8d7c2672 100644 --- a/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go +++ b/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go @@ -5,9 +5,9 @@ package updateUserExtensionAttribute import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateUserLanguage/data.go b/iSolarCloud/AppService/updateUserLanguage/data.go index 08ff41fd1..15617f7af 100644 --- a/iSolarCloud/AppService/updateUserLanguage/data.go +++ b/iSolarCloud/AppService/updateUserLanguage/data.go @@ -1,11 +1,12 @@ package updateUserLanguage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updateUserLanguage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateUserLanguage/struct.go b/iSolarCloud/AppService/updateUserLanguage/struct.go index 96697ebe3..b178f3e8d 100644 --- a/iSolarCloud/AppService/updateUserLanguage/struct.go +++ b/iSolarCloud/AppService/updateUserLanguage/struct.go @@ -5,9 +5,9 @@ package updateUserLanguage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateUserPosition/data.go b/iSolarCloud/AppService/updateUserPosition/data.go index 581bb227e..006feaeee 100644 --- a/iSolarCloud/AppService/updateUserPosition/data.go +++ b/iSolarCloud/AppService/updateUserPosition/data.go @@ -1,11 +1,12 @@ package updateUserPosition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updateUserPosition" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateUserPosition/struct.go b/iSolarCloud/AppService/updateUserPosition/struct.go index 8cb92df1e..16b076603 100644 --- a/iSolarCloud/AppService/updateUserPosition/struct.go +++ b/iSolarCloud/AppService/updateUserPosition/struct.go @@ -5,9 +5,9 @@ package updateUserPosition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/updateUserUpOrg/data.go b/iSolarCloud/AppService/updateUserUpOrg/data.go index e11bd3d4f..66d08d477 100644 --- a/iSolarCloud/AppService/updateUserUpOrg/data.go +++ b/iSolarCloud/AppService/updateUserUpOrg/data.go @@ -1,11 +1,12 @@ package updateUserUpOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/updateUserUpOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/updateUserUpOrg/struct.go b/iSolarCloud/AppService/updateUserUpOrg/struct.go index 958aa8e1c..9e95dfc47 100644 --- a/iSolarCloud/AppService/updateUserUpOrg/struct.go +++ b/iSolarCloud/AppService/updateUserUpOrg/struct.go @@ -5,9 +5,9 @@ package updateUserUpOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/upgrade/data.go b/iSolarCloud/AppService/upgrade/data.go index 186eeb65e..213cdf0c8 100644 --- a/iSolarCloud/AppService/upgrade/data.go +++ b/iSolarCloud/AppService/upgrade/data.go @@ -1,11 +1,12 @@ package upgrade import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/upgrade" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/upgrade/struct.go b/iSolarCloud/AppService/upgrade/struct.go index c7c8f3df8..77ecce495 100644 --- a/iSolarCloud/AppService/upgrade/struct.go +++ b/iSolarCloud/AppService/upgrade/struct.go @@ -5,9 +5,9 @@ package upgrade import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/upgrate/data.go b/iSolarCloud/AppService/upgrate/data.go index 809723ee7..cc2c7415a 100644 --- a/iSolarCloud/AppService/upgrate/data.go +++ b/iSolarCloud/AppService/upgrate/data.go @@ -1,11 +1,12 @@ package upgrate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/upgrade" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/upgrate/struct.go b/iSolarCloud/AppService/upgrate/struct.go index 4207d2aa2..c544daee5 100644 --- a/iSolarCloud/AppService/upgrate/struct.go +++ b/iSolarCloud/AppService/upgrate/struct.go @@ -5,9 +5,9 @@ package upgrate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/uploadFileToOss/data.go b/iSolarCloud/AppService/uploadFileToOss/data.go index ebf4b810f..177822fca 100644 --- a/iSolarCloud/AppService/uploadFileToOss/data.go +++ b/iSolarCloud/AppService/uploadFileToOss/data.go @@ -1,11 +1,12 @@ package uploadFileToOss import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/uploadFileToOss" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/uploadFileToOss/struct.go b/iSolarCloud/AppService/uploadFileToOss/struct.go index dcd7ec3fd..9ba55e682 100644 --- a/iSolarCloud/AppService/uploadFileToOss/struct.go +++ b/iSolarCloud/AppService/uploadFileToOss/struct.go @@ -5,9 +5,9 @@ package uploadFileToOss import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/userAgreeGdprProtocol/data.go b/iSolarCloud/AppService/userAgreeGdprProtocol/data.go index f947ce2be..d6ff14016 100644 --- a/iSolarCloud/AppService/userAgreeGdprProtocol/data.go +++ b/iSolarCloud/AppService/userAgreeGdprProtocol/data.go @@ -1,11 +1,12 @@ package userAgreeGdprProtocol import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/userAgreeGdprProtocol" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go b/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go index 936d6d63f..887d0b4f9 100644 --- a/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go +++ b/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go @@ -5,9 +5,9 @@ package userAgreeGdprProtocol import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/userInfoUniqueCheck/data.go b/iSolarCloud/AppService/userInfoUniqueCheck/data.go index 8441a775e..386f9fc47 100644 --- a/iSolarCloud/AppService/userInfoUniqueCheck/data.go +++ b/iSolarCloud/AppService/userInfoUniqueCheck/data.go @@ -1,11 +1,12 @@ package userInfoUniqueCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/userInfoUniqueCheck" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/userInfoUniqueCheck/struct.go b/iSolarCloud/AppService/userInfoUniqueCheck/struct.go index 9254abb70..e1c70a0a8 100644 --- a/iSolarCloud/AppService/userInfoUniqueCheck/struct.go +++ b/iSolarCloud/AppService/userInfoUniqueCheck/struct.go @@ -5,9 +5,9 @@ package userInfoUniqueCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/userMailHasBound/data.go b/iSolarCloud/AppService/userMailHasBound/data.go index 17a5ecd53..8be548a9c 100644 --- a/iSolarCloud/AppService/userMailHasBound/data.go +++ b/iSolarCloud/AppService/userMailHasBound/data.go @@ -1,11 +1,12 @@ package userMailHasBound import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/userMailHasBound" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/userMailHasBound/struct.go b/iSolarCloud/AppService/userMailHasBound/struct.go index d796b71e4..a2ab6c07a 100644 --- a/iSolarCloud/AppService/userMailHasBound/struct.go +++ b/iSolarCloud/AppService/userMailHasBound/struct.go @@ -5,9 +5,9 @@ package userMailHasBound import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/AppService/userRegister/data.go b/iSolarCloud/AppService/userRegister/data.go index 3ea268de7..edcba8a7d 100644 --- a/iSolarCloud/AppService/userRegister/data.go +++ b/iSolarCloud/AppService/userRegister/data.go @@ -1,11 +1,12 @@ package userRegister import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/userRegister" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/AppService/userRegister/struct.go b/iSolarCloud/AppService/userRegister/struct.go index 1fb79c5f3..c19c7ea0f 100644 --- a/iSolarCloud/AppService/userRegister/struct.go +++ b/iSolarCloud/AppService/userRegister/struct.go @@ -5,9 +5,9 @@ package userRegister import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/Common/images.go b/iSolarCloud/Common/images.go index 184f237d9..493ce705c 100644 --- a/iSolarCloud/Common/images.go +++ b/iSolarCloud/Common/images.go @@ -1,8 +1,8 @@ package Common import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) type Device struct { @@ -80,24 +80,24 @@ type Device struct { ZipCode valueTypes.String `json:"zip_code"` Images PowerStationImages `json:"images" PointArrayFlatten:"false"` - P83022y valueTypes.String `json:"p83022y" PointId:"p83022" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"Wh" PointVirtual:"true"` - P83046 valueTypes.Float `json:"p83046" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"kW" PointVirtual:"true"` - P83048 valueTypes.Float `json:"p83048" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83049 valueTypes.Float `json:"p83049" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83050 valueTypes.Float `json:"p83050" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83051 valueTypes.Float `json:"p83051" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83054 valueTypes.Float `json:"p83054" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83055 valueTypes.Float `json:"p83055" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83067 valueTypes.Float `json:"p83067" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"kW" PointVirtual:"true"` - P83070 valueTypes.Float `json:"p83070" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` - P83076 valueTypes.Float `json:"p83076" PointId:"_p83076" PointName:"Pv Power" PointIgnore:"true"` // Dupe of PvPower - P83077 valueTypes.Float `json:"p83077" PointId:"_p83077" PointName:"Pv Energy" PointIgnore:"true"` // Dupe of PvEnergy - P83081 valueTypes.Float `json:"p83081" PointId:"_p83081" PointName:"Es Power" PointIgnore:"true"` // Dupe of EsPower - P83089 valueTypes.Float `json:"p83089" PointId:"_p83089" PointName:"Es Discharge Energy" PointIgnore:"true"` // Dupe of EsDischargeEnergy - P83095 valueTypes.Float `json:"p83095" PointId:"_p83095" PointName:"Es Total Discharge Energy" PointIgnore:"true"` // Dupe of EsTotalDischargeEnergy - P83118 valueTypes.Float `json:"p83118" PointId:"_p83118" PointName:"Use Energy" PointIgnore:"true"` // Dupe of UseEnergy - P83120 valueTypes.Float `json:"p83120" PointId:"_p83120" PointName:"Es Energy" PointIgnore:"true"` // Dupe of EsEnergy - P83127 valueTypes.Float `json:"p83127" PointId:"_p83127" PointName:"Es Total Energy" PointIgnore:"true"` // Dupe of EsTotalEnergy + P83022y valueTypes.String `json:"p83022y" PointId:"p83022" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"Wh" PointVirtual:"true"` + P83046 valueTypes.Float `json:"p83046" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"kW" PointVirtual:"true"` + P83048 valueTypes.Float `json:"p83048" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83049 valueTypes.Float `json:"p83049" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83050 valueTypes.Float `json:"p83050" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83051 valueTypes.Float `json:"p83051" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83054 valueTypes.Float `json:"p83054" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83055 valueTypes.Float `json:"p83055" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83067 valueTypes.Float `json:"p83067" PointUpdateFreq:"UpdateFreq5Mins" PointUnit:"kW" PointVirtual:"true"` + P83070 valueTypes.Float `json:"p83070" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` + P83076 valueTypes.Float `json:"p83076" PointId:"_p83076" PointName:"Pv Power" PointIgnore:"true"` // Dupe of PvPower + P83077 valueTypes.Float `json:"p83077" PointId:"_p83077" PointName:"Pv Energy" PointIgnore:"true"` // Dupe of PvEnergy + P83081 valueTypes.Float `json:"p83081" PointId:"_p83081" PointName:"Es Power" PointIgnore:"true"` // Dupe of EsPower + P83089 valueTypes.Float `json:"p83089" PointId:"_p83089" PointName:"Es Discharge Energy" PointIgnore:"true"` // Dupe of EsDischargeEnergy + P83095 valueTypes.Float `json:"p83095" PointId:"_p83095" PointName:"Es Total Discharge Energy" PointIgnore:"true"` // Dupe of EsTotalDischargeEnergy + P83118 valueTypes.Float `json:"p83118" PointId:"_p83118" PointName:"Use Energy" PointIgnore:"true"` // Dupe of UseEnergy + P83120 valueTypes.Float `json:"p83120" PointId:"_p83120" PointName:"Es Energy" PointIgnore:"true"` // Dupe of EsEnergy + P83127 valueTypes.Float `json:"p83127" PointId:"_p83127" PointName:"Es Total Energy" PointIgnore:"true"` // Dupe of EsTotalEnergy Co2Reduce valueTypes.UnitValue `json:"co2_reduce" PointVirtual:"true"` Co2ReduceTotal valueTypes.UnitValue `json:"co2_reduce_total" PointUpdateFreq:"UpdateFreqTotal" PointVirtual:"true"` @@ -113,15 +113,15 @@ type Device struct { EsEnergy valueTypes.UnitValue `json:"es_energy" PointId:"p83120" PointName:"ES Energy" PointUpdateFreq:"UpdateFreq5Mins" PointVirtual:"true"` EsTotalEnergy valueTypes.UnitValue `json:"es_total_energy" PointId:"p83127" PointName:"ES Total Energy" PointUpdateFreq:"UpdateFreqTotal" PointVirtual:"true"` - ParamCo2 valueTypes.Float `json:"param_co2" PointVirtual:"true"` - ParamCoal valueTypes.Float `json:"param_coal" PointVirtual:"true"` - ParamIncome valueTypes.Float `json:"param_income" PointVirtual:"true"` - ParamMeter valueTypes.Float `json:"param_meter" PointVirtual:"true"` - ParamNox valueTypes.Float `json:"param_nox" PointVirtual:"true"` - ParamPowder valueTypes.Float `json:"param_powder" PointVirtual:"true"` - ParamSo2 valueTypes.Float `json:"param_so2" PointVirtual:"true"` - ParamTree valueTypes.Float `json:"param_tree" PointVirtual:"true"` - ParamWater valueTypes.Float `json:"param_water" PointVirtual:"true"` + ParamCo2 valueTypes.Float `json:"param_co2" PointVirtual:"true"` + ParamCoal valueTypes.Float `json:"param_coal" PointVirtual:"true"` + ParamIncome valueTypes.Float `json:"param_income" PointVirtual:"true"` + ParamMeter valueTypes.Float `json:"param_meter" PointVirtual:"true"` + ParamNox valueTypes.Float `json:"param_nox" PointVirtual:"true"` + ParamPowder valueTypes.Float `json:"param_powder" PointVirtual:"true"` + ParamSo2 valueTypes.Float `json:"param_so2" PointVirtual:"true"` + ParamTree valueTypes.Float `json:"param_tree" PointVirtual:"true"` + ParamWater valueTypes.Float `json:"param_water" PointVirtual:"true"` PrScale valueTypes.String `json:"pr_scale"` Radiation valueTypes.UnitValue `json:"radiation" PointVirtual:"true"` diff --git a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go index fedbaff70..a65a15f3f 100644 --- a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go +++ b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go @@ -1,11 +1,12 @@ package accumEnergyPsKpiData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/accumEnergyPsKpiData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go index f2a5902f6..2abf54baa 100644 --- a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go +++ b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go @@ -5,9 +5,9 @@ package accumEnergyPsKpiData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/addBuildProgressing/data.go b/iSolarCloud/MttvScreenService/addBuildProgressing/data.go index 701043b85..228e3abf5 100644 --- a/iSolarCloud/MttvScreenService/addBuildProgressing/data.go +++ b/iSolarCloud/MttvScreenService/addBuildProgressing/data.go @@ -1,11 +1,12 @@ package addBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/addBuildProgressing" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go index aa8afc2f9..9db214d2c 100644 --- a/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go +++ b/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go @@ -5,9 +5,9 @@ package addBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go b/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go index fbda21e4f..9f062b2f1 100644 --- a/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go +++ b/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go @@ -1,11 +1,12 @@ package deleteBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/deleteBuildProgressing" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go index 0af8e7d72..7ec81b8fc 100644 --- a/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go +++ b/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go @@ -5,9 +5,9 @@ package deleteBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go index 356db6d67..01d55d7aa 100644 --- a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go +++ b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go @@ -1,9 +1,10 @@ package energyEquivalentHoursRanking import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,8 +24,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { Result []interface{} `json:"result"` } diff --git a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go index d34ad4a17..fc5e16919 100644 --- a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go +++ b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go @@ -5,9 +5,9 @@ package energyEquivalentHoursRanking import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go b/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go index 091b0de70..b6ac0ac2e 100644 --- a/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go +++ b/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go @@ -1,11 +1,12 @@ package energyGetRankBySortName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/energyGetRankBySortName" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go b/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go index e21cbf78f..24c519c9d 100644 --- a/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go +++ b/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go @@ -5,9 +5,9 @@ package energyGetRankBySortName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go index 69e10de14..34385aff1 100644 --- a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go +++ b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go @@ -1,11 +1,12 @@ package energyPovertyAlleviation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/energyPovertyAlleviation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go index 3fcb08af7..4c6ff4978 100644 --- a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go +++ b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go @@ -5,9 +5,9 @@ package energyPovertyAlleviation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go index c047f94a5..dea89fc67 100644 --- a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go +++ b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go @@ -1,9 +1,10 @@ package energyPowerGenerationTrends import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,8 +24,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { KpiList []interface{} `json:"kpiList"` } diff --git a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go index e2c750ce2..3bae2473f 100644 --- a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go +++ b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go @@ -5,9 +5,9 @@ package energyPowerGenerationTrends import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/findSingleStationPR/data.go b/iSolarCloud/MttvScreenService/findSingleStationPR/data.go index 11abdbe30..d5a8e23ae 100644 --- a/iSolarCloud/MttvScreenService/findSingleStationPR/data.go +++ b/iSolarCloud/MttvScreenService/findSingleStationPR/data.go @@ -1,11 +1,12 @@ package findSingleStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/findSingleStationPR" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go b/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go index c18c52c15..29f33eef6 100644 --- a/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go +++ b/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go @@ -5,9 +5,9 @@ package findSingleStationPR import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go b/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go index 8836b2c31..93516b82e 100644 --- a/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go +++ b/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go @@ -1,11 +1,12 @@ package getCapabilityTrend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getCapabilityTrend" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go b/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go index 4a7948a61..1b32a5aa6 100644 --- a/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go +++ b/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go @@ -5,9 +5,9 @@ package getCapabilityTrend import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go index 8ac9adf71..63fc1e44c 100644 --- a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go +++ b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go @@ -1,11 +1,12 @@ package getKpiByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getKpiByUserIdAndAreaCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go index 2422fd415..1dc336a03 100644 --- a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go +++ b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go @@ -5,9 +5,9 @@ package getKpiByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getMapByUser/data.go b/iSolarCloud/MttvScreenService/getMapByUser/data.go index 7663fdf81..476ea5016 100644 --- a/iSolarCloud/MttvScreenService/getMapByUser/data.go +++ b/iSolarCloud/MttvScreenService/getMapByUser/data.go @@ -1,11 +1,12 @@ package getMapByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getMapByUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getMapByUser/struct.go b/iSolarCloud/MttvScreenService/getMapByUser/struct.go index 70a73edbe..9e7db97aa 100644 --- a/iSolarCloud/MttvScreenService/getMapByUser/struct.go +++ b/iSolarCloud/MttvScreenService/getMapByUser/struct.go @@ -5,9 +5,9 @@ package getMapByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go b/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go index 8fe024f71..ce276bff1 100644 --- a/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go +++ b/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go @@ -1,11 +1,12 @@ package getOrgProByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgProByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go b/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go index 95437e6c8..8162c68ef 100644 --- a/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go +++ b/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go @@ -5,9 +5,9 @@ package getOrgProByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go b/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go index a9cebfb28..e393146d5 100644 --- a/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go +++ b/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go @@ -1,11 +1,12 @@ package getPlanAndActualPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPlanAndActualPower" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go b/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go index 57a1b7c9e..825f08004 100644 --- a/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go +++ b/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go @@ -5,9 +5,9 @@ package getPlanAndActualPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go b/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go index fb4804d21..0b0c6d831 100644 --- a/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go +++ b/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go @@ -1,10 +1,11 @@ package getPsDeviceListValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPsDeviceListValue" @@ -12,7 +13,7 @@ const Disabled = false const EndPointName = "MttvScreenService.getPsDeviceListValue" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,13 +27,13 @@ func (rd RequestData) Help() string { type ResultData struct { List []struct { - GoStruct GoStruct.GoStruct `json:"-" PointIdFromChild:"PsKey" PointIdReplace:"true" PointDeviceFrom:"PsKey"` + GoStruct GoStruct.GoStruct `json:"-" PointIdFromChild:"PsKey" PointIdReplace:"true" PointDeviceFrom:"PsKey"` - PsKey valueTypes.String `json:"pskey" PointId:"ps_key"` - PsId valueTypes.Integer `json:"ps_id"` - DeviceType valueTypes.Integer `json:"device_type"` - DeviceCode valueTypes.Integer `json:"device_code"` - ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` + PsKey valueTypes.String `json:"pskey" PointId:"ps_key"` + PsId valueTypes.Integer `json:"ps_id"` + DeviceType valueTypes.Integer `json:"device_type"` + DeviceCode valueTypes.Integer `json:"device_code"` + ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"` AttrId valueTypes.Integer `json:"attr_id"` ComponentAmount valueTypes.Integer `json:"component_amount"` diff --git a/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go b/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go index c2611bd7c..652ae03cd 100644 --- a/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go +++ b/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go @@ -5,9 +5,9 @@ package getPsDeviceListValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go index 65bf5fbeb..0b0d6e150 100644 --- a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go +++ b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go @@ -1,11 +1,12 @@ package getPsInfoWithJoinGridByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsInfoWithJoinGridByPsId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go index 8f1720606..a23b08e6a 100644 --- a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go +++ b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go @@ -5,9 +5,9 @@ package getPsInfoWithJoinGridByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go index 76a7e9df3..fdb8f79ad 100644 --- a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go +++ b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go @@ -1,11 +1,12 @@ package getPsKpiForHoursByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -28,7 +29,7 @@ func (rd RequestData) Help() string { } type ResultData struct { - Hours map[string]Hour `json:"hours" DataTable:"true" DataTableIndex:"true"` // DataTableSortOn:"Index"` + Hours map[string]Hour `json:"hours" DataTable:"true" DataTableIndex:"true"` // DataTableSortOn:"Index"` } type Hour struct { diff --git a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go index 1f487bd6d..ae3342f39 100644 --- a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go +++ b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go @@ -5,9 +5,9 @@ package getPsKpiForHoursByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -306,7 +302,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { return api.MarshalJSON(e) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -330,7 +325,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -362,4 +356,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPsListByMapId/data.go b/iSolarCloud/MttvScreenService/getPsListByMapId/data.go index 2cbe63531..c60cb061d 100644 --- a/iSolarCloud/MttvScreenService/getPsListByMapId/data.go +++ b/iSolarCloud/MttvScreenService/getPsListByMapId/data.go @@ -1,8 +1,8 @@ package getPsListByMapId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go b/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go index 76c5ebddf..cef8c6d5a 100644 --- a/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go +++ b/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go @@ -5,9 +5,9 @@ package getPsListByMapId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go index 65ef314b9..504832cf9 100644 --- a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go +++ b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go @@ -1,11 +1,12 @@ package getPsListByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsListByUserIdAndAreaCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go index f3f92d520..7cc82c5d1 100644 --- a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go +++ b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go @@ -5,9 +5,9 @@ package getPsListByUserIdAndAreaCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go index fc251dbe2..80c9f3710 100644 --- a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go +++ b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go @@ -1,10 +1,11 @@ package getTheoryAndActualPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -16,7 +17,7 @@ type RequestData struct { // ws.missing-parameter:user_id or ps_id // @TODO - Figure out why duplicate UserId entries in the structure causes json.Marshall to bork in iSolarCloud/api/web.go:128 PsId valueTypes.PsId `json:"ps_id" required:"true"` - UserId valueTypes.String `json:"user_id"` // required:"true"` + UserId valueTypes.String `json:"user_id"` // required:"true"` } func (rd RequestData) IsValid() error { @@ -28,7 +29,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go index dbdecd450..52ecb82e8 100644 --- a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go +++ b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go @@ -5,9 +5,9 @@ package getTheoryAndActualPower import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go b/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go index 9d0566d92..d1621da11 100644 --- a/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go +++ b/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go @@ -1,11 +1,12 @@ package nextLevelOrgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/nextLevelOrgList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go b/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go index f8685255e..2b9af579f 100644 --- a/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go +++ b/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go @@ -5,9 +5,9 @@ package nextLevelOrgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go index 82ca5c789..2919189eb 100644 --- a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go +++ b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go @@ -1,11 +1,12 @@ package nextLevelOrgStatisticalDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/nextLevelOrgStatisticalDataList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go index ca903d28d..0bf934645 100644 --- a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go +++ b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go @@ -5,9 +5,9 @@ package nextLevelOrgStatisticalDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/orgPowerReport/data.go b/iSolarCloud/MttvScreenService/orgPowerReport/data.go index 63379145c..675092b45 100644 --- a/iSolarCloud/MttvScreenService/orgPowerReport/data.go +++ b/iSolarCloud/MttvScreenService/orgPowerReport/data.go @@ -1,10 +1,11 @@ package orgPowerReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "MttvScreenService.orgPowerReport" type RequestData struct { - Type valueTypes.Integer `json:"type" required:"true"` + Type valueTypes.Integer `json:"type" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,8 +26,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { RespMsg valueTypes.String `json:"respMsg" PointId:"resp_msg"` } diff --git a/iSolarCloud/MttvScreenService/orgPowerReport/struct.go b/iSolarCloud/MttvScreenService/orgPowerReport/struct.go index aa85a8160..6f7b5fdef 100644 --- a/iSolarCloud/MttvScreenService/orgPowerReport/struct.go +++ b/iSolarCloud/MttvScreenService/orgPowerReport/struct.go @@ -5,9 +5,9 @@ package orgPowerReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go index 6f3ec0990..55877d594 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go @@ -1,11 +1,12 @@ package queryBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryBuildProgressing" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go index 59fb1d86d..b7a1093fb 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go @@ -5,9 +5,9 @@ package queryBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go index 78fa0a58f..322c6e69f 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go @@ -1,11 +1,12 @@ package queryBuildProgressingNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryBuildProgressingNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go index d3ef8b056..1c2b73a22 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go @@ -5,9 +5,9 @@ package queryBuildProgressingNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go index 0f538af95..331bd5b19 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go @@ -1,11 +1,12 @@ package queryBuildProgressingOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryBuildProgressingOne" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go index 85eb8c4a6..7d9afdfc1 100644 --- a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go +++ b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go @@ -5,9 +5,9 @@ package queryBuildProgressingOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go index 64824a20c..f2c00e5ec 100644 --- a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go +++ b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go @@ -1,11 +1,12 @@ package queryNearlyTwoYearsGenAndPrft import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/queryNearlyTwoYearsGenAndPrft" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go index 349720d33..33188cc6e 100644 --- a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go +++ b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go @@ -5,9 +5,9 @@ package queryNearlyTwoYearsGenAndPrft import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go index 4755d7d3e..9c1ccbd26 100644 --- a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go +++ b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go @@ -1,11 +1,12 @@ package querySaveEnergyPsSOH import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/querySaveEnergyPsSOH" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go index f1e63fba9..bb2ab85ed 100644 --- a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go +++ b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go @@ -5,9 +5,9 @@ package querySaveEnergyPsSOH import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go index 89533491f..2befcd8fa 100644 --- a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go +++ b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go @@ -1,11 +1,12 @@ package queryScreenUserMdIfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryScreenUserMdIfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go index 226dee3dc..4d972eec0 100644 --- a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go +++ b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go @@ -5,9 +5,9 @@ package queryScreenUserMdIfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go index 52859379e..a0f6b055d 100644 --- a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go +++ b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go @@ -1,11 +1,12 @@ package saveOrUpdatePosition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveOrUpdatePosition" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go index 8c9c8c754..a8b229dd9 100644 --- a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go +++ b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go @@ -5,9 +5,9 @@ package saveOrUpdatePosition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/MttvScreenService/struct.go b/iSolarCloud/MttvScreenService/struct.go index 4a4dda3c0..b3f264b71 100644 --- a/iSolarCloud/MttvScreenService/struct.go +++ b/iSolarCloud/MttvScreenService/struct.go @@ -2,39 +2,40 @@ package MttvScreenService import ( - "GoSungrow/iSolarCloud/MttvScreenService/accumEnergyPsKpiData" - "GoSungrow/iSolarCloud/MttvScreenService/addBuildProgressing" - "GoSungrow/iSolarCloud/MttvScreenService/deleteBuildProgressing" - "GoSungrow/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking" - "GoSungrow/iSolarCloud/MttvScreenService/energyGetRankBySortName" - "GoSungrow/iSolarCloud/MttvScreenService/energyPovertyAlleviation" - "GoSungrow/iSolarCloud/MttvScreenService/energyPowerGenerationTrends" - "GoSungrow/iSolarCloud/MttvScreenService/findSingleStationPR" - "GoSungrow/iSolarCloud/MttvScreenService/getCapabilityTrend" - "GoSungrow/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode" - "GoSungrow/iSolarCloud/MttvScreenService/getMapByUser" - "GoSungrow/iSolarCloud/MttvScreenService/getOrgProByUserId" - "GoSungrow/iSolarCloud/MttvScreenService/getPlanAndActualPower" - "GoSungrow/iSolarCloud/MttvScreenService/getPsDeviceListValue" - "GoSungrow/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId" - "GoSungrow/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId" - "GoSungrow/iSolarCloud/MttvScreenService/getPsListByMapId" - "GoSungrow/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode" - "GoSungrow/iSolarCloud/MttvScreenService/getTheoryAndActualPower" - "GoSungrow/iSolarCloud/MttvScreenService/nextLevelOrgList" - "GoSungrow/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList" - "GoSungrow/iSolarCloud/MttvScreenService/orgPowerReport" - "GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressing" - "GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressingNew" - "GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressingOne" - "GoSungrow/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft" - "GoSungrow/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH" - "GoSungrow/iSolarCloud/MttvScreenService/queryScreenUserMdIfo" - "GoSungrow/iSolarCloud/MttvScreenService/saveOrUpdatePosition" - "GoSungrow/iSolarCloud/MttvScreenService/updateBuildProgressing" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/accumEnergyPsKpiData" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/addBuildProgressing" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/deleteBuildProgressing" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/energyGetRankBySortName" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/energyPovertyAlleviation" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/energyPowerGenerationTrends" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/findSingleStationPR" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getCapabilityTrend" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getMapByUser" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getOrgProByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPlanAndActualPower" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsDeviceListValue" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsListByMapId" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getTheoryAndActualPower" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/nextLevelOrgList" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/orgPowerReport" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressing" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressingNew" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/queryBuildProgressingOne" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/queryScreenUserMdIfo" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/saveOrUpdatePosition" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/updateBuildProgressing" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) var _ api.Area = (*Area)(nil) diff --git a/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go b/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go index cc317b268..dc7af8227 100644 --- a/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go +++ b/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go @@ -1,11 +1,12 @@ package updateBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/updateBuildProgressing" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go index 582e72c08..fc845b9e7 100644 --- a/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go +++ b/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go @@ -5,9 +5,9 @@ package updateBuildProgressing import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/NullArea/NullEndpoint/data.go b/iSolarCloud/NullArea/NullEndpoint/data.go index 5dfd82351..9c4b12133 100644 --- a/iSolarCloud/NullArea/NullEndpoint/data.go +++ b/iSolarCloud/NullArea/NullEndpoint/data.go @@ -1,14 +1,14 @@ package NullEndpoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) - const Url = "%URL%" const Disabled = false const EndPointName = "NullArea.NullEndpoint" diff --git a/iSolarCloud/NullArea/NullEndpoint/struct.go b/iSolarCloud/NullArea/NullEndpoint/struct.go index 5044cd579..165a028a4 100644 --- a/iSolarCloud/NullArea/NullEndpoint/struct.go +++ b/iSolarCloud/NullArea/NullEndpoint/struct.go @@ -5,16 +5,16 @@ package NullEndpoint import ( - "github.com/MickMake/GoUnify/Only" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -22,8 +22,8 @@ var _ api.EndPoint = (*EndPoint)(nil) // EndPoint - Holds the request, response and web method structures. type EndPoint struct { api.EndPointStruct - Request Request - Response Response + Request Request + Response Response RawResponse []byte } @@ -54,7 +54,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +75,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +168,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +241,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +296,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +319,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +358,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +389,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/NullArea/struct.go b/iSolarCloud/NullArea/struct.go index 9e6115ae2..7fc70885c 100644 --- a/iSolarCloud/NullArea/struct.go +++ b/iSolarCloud/NullArea/struct.go @@ -1,12 +1,12 @@ package NullArea import ( - "GoSungrow/iSolarCloud/NullArea/NullEndpoint" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" -) + "github.com/MickMake/GoSungrow/iSolarCloud/NullArea/NullEndpoint" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" +) var _ api.Area = (*Area)(nil) diff --git a/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go b/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go index 609211d60..b3ba6a2f5 100644 --- a/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go +++ b/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go @@ -1,11 +1,12 @@ package queryPointDataTopOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryPointDataTopOne" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go b/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go index 28f9f3407..a158d93a7 100644 --- a/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go +++ b/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go @@ -5,9 +5,9 @@ package queryPointDataTopOne import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/PowerPointService/struct.go b/iSolarCloud/PowerPointService/struct.go index 8dba7509d..cc32f71d2 100644 --- a/iSolarCloud/PowerPointService/struct.go +++ b/iSolarCloud/PowerPointService/struct.go @@ -2,10 +2,11 @@ package PowerPointService import ( - "GoSungrow/iSolarCloud/PowerPointService/queryPointDataTopOne" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/PowerPointService/queryPointDataTopOne" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) var _ api.Area = (*Area)(nil) diff --git a/iSolarCloud/WebAppService/addMaterial/data.go b/iSolarCloud/WebAppService/addMaterial/data.go index 18fe12129..8f14c7648 100644 --- a/iSolarCloud/WebAppService/addMaterial/data.go +++ b/iSolarCloud/WebAppService/addMaterial/data.go @@ -1,11 +1,12 @@ package addMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/addMaterial" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/addMaterial/struct.go b/iSolarCloud/WebAppService/addMaterial/struct.go index 9d7df613a..f8262a583 100644 --- a/iSolarCloud/WebAppService/addMaterial/struct.go +++ b/iSolarCloud/WebAppService/addMaterial/struct.go @@ -5,9 +5,9 @@ package addMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/addOptTicketInfo/data.go b/iSolarCloud/WebAppService/addOptTicketInfo/data.go index b10a93b94..0cdc33e3c 100644 --- a/iSolarCloud/WebAppService/addOptTicketInfo/data.go +++ b/iSolarCloud/WebAppService/addOptTicketInfo/data.go @@ -1,11 +1,12 @@ package addOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/addOptTicketInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/addOptTicketInfo/struct.go b/iSolarCloud/WebAppService/addOptTicketInfo/struct.go index 8ea88b14d..bb9755c43 100644 --- a/iSolarCloud/WebAppService/addOptTicketInfo/struct.go +++ b/iSolarCloud/WebAppService/addOptTicketInfo/struct.go @@ -5,9 +5,9 @@ package addOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/addSpareParts/data.go b/iSolarCloud/WebAppService/addSpareParts/data.go index 1c71de83d..a4d5c09bc 100644 --- a/iSolarCloud/WebAppService/addSpareParts/data.go +++ b/iSolarCloud/WebAppService/addSpareParts/data.go @@ -1,11 +1,12 @@ package addSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/addSpareParts" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/addSpareParts/struct.go b/iSolarCloud/WebAppService/addSpareParts/struct.go index 802f437dc..6dd4aba8e 100644 --- a/iSolarCloud/WebAppService/addSpareParts/struct.go +++ b/iSolarCloud/WebAppService/addSpareParts/struct.go @@ -5,9 +5,9 @@ package addSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/associateQueryFaultNames/data.go b/iSolarCloud/WebAppService/associateQueryFaultNames/data.go index 6bcb27b91..684e13ac7 100644 --- a/iSolarCloud/WebAppService/associateQueryFaultNames/data.go +++ b/iSolarCloud/WebAppService/associateQueryFaultNames/data.go @@ -1,11 +1,12 @@ package associateQueryFaultNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/associateQueryFaultNames" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go b/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go index e1f932c31..76347d977 100644 --- a/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go +++ b/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go @@ -5,9 +5,9 @@ package associateQueryFaultNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go b/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go index df5cc0b73..d605b44bf 100644 --- a/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go +++ b/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go @@ -1,11 +1,12 @@ package auditPsDeviceCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/auditPsDeviceCheck" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go b/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go index 7e499bab4..6930fb969 100644 --- a/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go +++ b/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go @@ -5,9 +5,9 @@ package auditPsDeviceCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/calcOutputRankByDay/data.go b/iSolarCloud/WebAppService/calcOutputRankByDay/data.go index f366e6b22..be02c8464 100644 --- a/iSolarCloud/WebAppService/calcOutputRankByDay/data.go +++ b/iSolarCloud/WebAppService/calcOutputRankByDay/data.go @@ -1,11 +1,12 @@ package calcOutputRankByDay import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/calcOutputRankByDay" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go b/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go index 4976cf003..2fa5f5739 100644 --- a/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go +++ b/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go @@ -5,9 +5,9 @@ package calcOutputRankByDay import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/changeReadStatus/data.go b/iSolarCloud/WebAppService/changeReadStatus/data.go index f150d4caa..f8452c15f 100644 --- a/iSolarCloud/WebAppService/changeReadStatus/data.go +++ b/iSolarCloud/WebAppService/changeReadStatus/data.go @@ -1,11 +1,12 @@ package changeReadStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/changeReadStatus" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/changeReadStatus/struct.go b/iSolarCloud/WebAppService/changeReadStatus/struct.go index fc5dbf086..315b0f8a4 100644 --- a/iSolarCloud/WebAppService/changeReadStatus/struct.go +++ b/iSolarCloud/WebAppService/changeReadStatus/struct.go @@ -5,9 +5,9 @@ package changeReadStatus import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/checkMaterialName/data.go b/iSolarCloud/WebAppService/checkMaterialName/data.go index 5d039bf0a..9b0b2b21b 100644 --- a/iSolarCloud/WebAppService/checkMaterialName/data.go +++ b/iSolarCloud/WebAppService/checkMaterialName/data.go @@ -1,11 +1,12 @@ package checkMaterialName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/checkMaterialName" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/checkMaterialName/struct.go b/iSolarCloud/WebAppService/checkMaterialName/struct.go index 4d5658df7..c41f98fb0 100644 --- a/iSolarCloud/WebAppService/checkMaterialName/struct.go +++ b/iSolarCloud/WebAppService/checkMaterialName/struct.go @@ -5,9 +5,9 @@ package checkMaterialName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/confirmFault/data.go b/iSolarCloud/WebAppService/confirmFault/data.go index e29a6f8f8..93d194dc6 100644 --- a/iSolarCloud/WebAppService/confirmFault/data.go +++ b/iSolarCloud/WebAppService/confirmFault/data.go @@ -1,11 +1,12 @@ package confirmFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/confirmOrCloseFault" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/confirmFault/struct.go b/iSolarCloud/WebAppService/confirmFault/struct.go index 488e59277..6e8b318bb 100644 --- a/iSolarCloud/WebAppService/confirmFault/struct.go +++ b/iSolarCloud/WebAppService/confirmFault/struct.go @@ -5,9 +5,9 @@ package confirmFault import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/copeOperateTicket/data.go b/iSolarCloud/WebAppService/copeOperateTicket/data.go index f7b4536cb..e00e96173 100644 --- a/iSolarCloud/WebAppService/copeOperateTicket/data.go +++ b/iSolarCloud/WebAppService/copeOperateTicket/data.go @@ -1,11 +1,12 @@ package copeOperateTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/copeOperateTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/copeOperateTicket/struct.go b/iSolarCloud/WebAppService/copeOperateTicket/struct.go index 0c4ad48ff..8eb0f62be 100644 --- a/iSolarCloud/WebAppService/copeOperateTicket/struct.go +++ b/iSolarCloud/WebAppService/copeOperateTicket/struct.go @@ -5,9 +5,9 @@ package copeOperateTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/copySecondTypeTicket/data.go b/iSolarCloud/WebAppService/copySecondTypeTicket/data.go index de6b2bace..318bf0f70 100644 --- a/iSolarCloud/WebAppService/copySecondTypeTicket/data.go +++ b/iSolarCloud/WebAppService/copySecondTypeTicket/data.go @@ -1,11 +1,12 @@ package copySecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/copySecondTypeTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go b/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go index 3b12e1eb3..979d9aef3 100644 --- a/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go +++ b/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go @@ -5,9 +5,9 @@ package copySecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/copyWorkTicket/data.go b/iSolarCloud/WebAppService/copyWorkTicket/data.go index 1937fa708..6c44c460a 100644 --- a/iSolarCloud/WebAppService/copyWorkTicket/data.go +++ b/iSolarCloud/WebAppService/copyWorkTicket/data.go @@ -1,11 +1,12 @@ package copyWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/copyWorkTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/copyWorkTicket/struct.go b/iSolarCloud/WebAppService/copyWorkTicket/struct.go index ee7b73764..1abc29fa0 100644 --- a/iSolarCloud/WebAppService/copyWorkTicket/struct.go +++ b/iSolarCloud/WebAppService/copyWorkTicket/struct.go @@ -5,9 +5,9 @@ package copyWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/delOptTicketInfo/data.go b/iSolarCloud/WebAppService/delOptTicketInfo/data.go index 01b5ccbe0..5752b3fc3 100644 --- a/iSolarCloud/WebAppService/delOptTicketInfo/data.go +++ b/iSolarCloud/WebAppService/delOptTicketInfo/data.go @@ -1,11 +1,12 @@ package delOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/delOptTicketInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/delOptTicketInfo/struct.go b/iSolarCloud/WebAppService/delOptTicketInfo/struct.go index 43a31089e..2e58efc83 100644 --- a/iSolarCloud/WebAppService/delOptTicketInfo/struct.go +++ b/iSolarCloud/WebAppService/delOptTicketInfo/struct.go @@ -5,9 +5,9 @@ package delOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteDuty/data.go b/iSolarCloud/WebAppService/deleteDuty/data.go index dc7f227f2..e3a69b322 100644 --- a/iSolarCloud/WebAppService/deleteDuty/data.go +++ b/iSolarCloud/WebAppService/deleteDuty/data.go @@ -1,11 +1,12 @@ package deleteDuty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteDuty" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteDuty/struct.go b/iSolarCloud/WebAppService/deleteDuty/struct.go index 7d5665fc6..95aabb807 100644 --- a/iSolarCloud/WebAppService/deleteDuty/struct.go +++ b/iSolarCloud/WebAppService/deleteDuty/struct.go @@ -5,9 +5,9 @@ package deleteDuty import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteDutyMid/data.go b/iSolarCloud/WebAppService/deleteDutyMid/data.go index ba661b7ae..aa63ff00c 100644 --- a/iSolarCloud/WebAppService/deleteDutyMid/data.go +++ b/iSolarCloud/WebAppService/deleteDutyMid/data.go @@ -1,11 +1,12 @@ package deleteDutyMid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteDutyMid" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteDutyMid/struct.go b/iSolarCloud/WebAppService/deleteDutyMid/struct.go index a6c418f4d..00b7ad0ba 100644 --- a/iSolarCloud/WebAppService/deleteDutyMid/struct.go +++ b/iSolarCloud/WebAppService/deleteDutyMid/struct.go @@ -5,9 +5,9 @@ package deleteDutyMid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteMaterial/data.go b/iSolarCloud/WebAppService/deleteMaterial/data.go index bd4602a34..06d64ec3f 100644 --- a/iSolarCloud/WebAppService/deleteMaterial/data.go +++ b/iSolarCloud/WebAppService/deleteMaterial/data.go @@ -1,11 +1,12 @@ package deleteMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteMaterial" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteMaterial/struct.go b/iSolarCloud/WebAppService/deleteMaterial/struct.go index 018129e16..58a282440 100644 --- a/iSolarCloud/WebAppService/deleteMaterial/struct.go +++ b/iSolarCloud/WebAppService/deleteMaterial/struct.go @@ -5,9 +5,9 @@ package deleteMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go index 69702d08b..4355ea487 100644 --- a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go +++ b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go @@ -1,11 +1,12 @@ package deleteOrSharedSelfReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/deleteOrSharedSelfReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go index 31917a626..90006bcd9 100644 --- a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go +++ b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go @@ -5,9 +5,9 @@ package deleteOrSharedSelfReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go b/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go index d5450b1bb..fd87349a4 100644 --- a/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go +++ b/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go @@ -1,11 +1,12 @@ package deleteSecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteSecondTypeTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go b/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go index 9f4e7e947..005b7ca96 100644 --- a/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go +++ b/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go @@ -5,9 +5,9 @@ package deleteSecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteSparePartsById/data.go b/iSolarCloud/WebAppService/deleteSparePartsById/data.go index b939612b8..0d6b5af20 100644 --- a/iSolarCloud/WebAppService/deleteSparePartsById/data.go +++ b/iSolarCloud/WebAppService/deleteSparePartsById/data.go @@ -1,11 +1,12 @@ package deleteSparePartsById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteSparePartsById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteSparePartsById/struct.go b/iSolarCloud/WebAppService/deleteSparePartsById/struct.go index d19b81083..e0b083e18 100644 --- a/iSolarCloud/WebAppService/deleteSparePartsById/struct.go +++ b/iSolarCloud/WebAppService/deleteSparePartsById/struct.go @@ -5,9 +5,9 @@ package deleteSparePartsById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deleteWorkTicket/data.go b/iSolarCloud/WebAppService/deleteWorkTicket/data.go index 5ba67d1af..caec2891f 100644 --- a/iSolarCloud/WebAppService/deleteWorkTicket/data.go +++ b/iSolarCloud/WebAppService/deleteWorkTicket/data.go @@ -1,11 +1,12 @@ package deleteWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteWorkTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deleteWorkTicket/struct.go b/iSolarCloud/WebAppService/deleteWorkTicket/struct.go index b36550c3e..56e807dfd 100644 --- a/iSolarCloud/WebAppService/deleteWorkTicket/struct.go +++ b/iSolarCloud/WebAppService/deleteWorkTicket/struct.go @@ -5,9 +5,9 @@ package deleteWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/deviceFactoryList/data.go b/iSolarCloud/WebAppService/deviceFactoryList/data.go index f73ce3a64..5973bd482 100644 --- a/iSolarCloud/WebAppService/deviceFactoryList/data.go +++ b/iSolarCloud/WebAppService/deviceFactoryList/data.go @@ -1,11 +1,12 @@ package deviceFactoryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deviceFactoryList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/deviceFactoryList/struct.go b/iSolarCloud/WebAppService/deviceFactoryList/struct.go index b421e1ff4..dfbe0d55c 100644 --- a/iSolarCloud/WebAppService/deviceFactoryList/struct.go +++ b/iSolarCloud/WebAppService/deviceFactoryList/struct.go @@ -5,9 +5,9 @@ package deviceFactoryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/dispartDataPageList/data.go b/iSolarCloud/WebAppService/dispartDataPageList/data.go index 5a593d447..8e1c7a62e 100644 --- a/iSolarCloud/WebAppService/dispartDataPageList/data.go +++ b/iSolarCloud/WebAppService/dispartDataPageList/data.go @@ -1,11 +1,12 @@ package dispartDataPageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/dispartDataPageList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/dispartDataPageList/struct.go b/iSolarCloud/WebAppService/dispartDataPageList/struct.go index 12e708cb0..4b7c7f002 100644 --- a/iSolarCloud/WebAppService/dispartDataPageList/struct.go +++ b/iSolarCloud/WebAppService/dispartDataPageList/struct.go @@ -5,9 +5,9 @@ package dispartDataPageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/executeTask/data.go b/iSolarCloud/WebAppService/executeTask/data.go index 6a4b7ffe8..5c9840cff 100644 --- a/iSolarCloud/WebAppService/executeTask/data.go +++ b/iSolarCloud/WebAppService/executeTask/data.go @@ -1,11 +1,12 @@ package executeTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/executeTask" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/executeTask/struct.go b/iSolarCloud/WebAppService/executeTask/struct.go index 92dad01cc..2f6eb3777 100644 --- a/iSolarCloud/WebAppService/executeTask/struct.go +++ b/iSolarCloud/WebAppService/executeTask/struct.go @@ -5,9 +5,9 @@ package executeTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findCurrentTask/data.go b/iSolarCloud/WebAppService/findCurrentTask/data.go index e3b81e39f..13069849f 100644 --- a/iSolarCloud/WebAppService/findCurrentTask/data.go +++ b/iSolarCloud/WebAppService/findCurrentTask/data.go @@ -1,11 +1,12 @@ package findCurrentTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/findCurrentTask" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findCurrentTask/struct.go b/iSolarCloud/WebAppService/findCurrentTask/struct.go index 1fb450095..6f19b2ea1 100644 --- a/iSolarCloud/WebAppService/findCurrentTask/struct.go +++ b/iSolarCloud/WebAppService/findCurrentTask/struct.go @@ -5,9 +5,9 @@ package findCurrentTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go b/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go index 0fce81c5b..657af0cff 100644 --- a/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go +++ b/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go @@ -1,11 +1,12 @@ package findDeviceMessageByPskey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/findDeviceMessageByPskey" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go b/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go index 015866eb3..05731b011 100644 --- a/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go +++ b/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go @@ -5,9 +5,9 @@ package findDeviceMessageByPskey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findFactoryMessage/data.go b/iSolarCloud/WebAppService/findFactoryMessage/data.go index 06d98d4fc..3b8ef08a7 100644 --- a/iSolarCloud/WebAppService/findFactoryMessage/data.go +++ b/iSolarCloud/WebAppService/findFactoryMessage/data.go @@ -1,11 +1,12 @@ package findFactoryMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/findFactoryMessage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findFactoryMessage/struct.go b/iSolarCloud/WebAppService/findFactoryMessage/struct.go index 787bcbac3..f8f97dabf 100644 --- a/iSolarCloud/WebAppService/findFactoryMessage/struct.go +++ b/iSolarCloud/WebAppService/findFactoryMessage/struct.go @@ -5,9 +5,9 @@ package findFactoryMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findImgResources/data.go b/iSolarCloud/WebAppService/findImgResources/data.go index 82be38364..f14afdac8 100644 --- a/iSolarCloud/WebAppService/findImgResources/data.go +++ b/iSolarCloud/WebAppService/findImgResources/data.go @@ -1,11 +1,12 @@ package findImgResources import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/findImgResources" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findImgResources/struct.go b/iSolarCloud/WebAppService/findImgResources/struct.go index a252f1ace..f2f9f80ca 100644 --- a/iSolarCloud/WebAppService/findImgResources/struct.go +++ b/iSolarCloud/WebAppService/findImgResources/struct.go @@ -5,9 +5,9 @@ package findImgResources import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findMateiralSubType/data.go b/iSolarCloud/WebAppService/findMateiralSubType/data.go index d3c9097c4..9d40d80fd 100644 --- a/iSolarCloud/WebAppService/findMateiralSubType/data.go +++ b/iSolarCloud/WebAppService/findMateiralSubType/data.go @@ -1,11 +1,12 @@ package findMateiralSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/findMateiralSubType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findMateiralSubType/struct.go b/iSolarCloud/WebAppService/findMateiralSubType/struct.go index 78b9b230a..8012b1286 100644 --- a/iSolarCloud/WebAppService/findMateiralSubType/struct.go +++ b/iSolarCloud/WebAppService/findMateiralSubType/struct.go @@ -5,9 +5,9 @@ package findMateiralSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findMaterialById/data.go b/iSolarCloud/WebAppService/findMaterialById/data.go index 8b8ca0b97..7aa193544 100644 --- a/iSolarCloud/WebAppService/findMaterialById/data.go +++ b/iSolarCloud/WebAppService/findMaterialById/data.go @@ -1,11 +1,12 @@ package findMaterialById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/findMaterialById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findMaterialById/struct.go b/iSolarCloud/WebAppService/findMaterialById/struct.go index ab593080e..af6af2702 100644 --- a/iSolarCloud/WebAppService/findMaterialById/struct.go +++ b/iSolarCloud/WebAppService/findMaterialById/struct.go @@ -5,9 +5,9 @@ package findMaterialById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go b/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go index 94472b7bd..f1750cbc8 100644 --- a/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go +++ b/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go @@ -1,11 +1,12 @@ package findMyDealedCurrentTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/findMyDealedCurrentTask" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go b/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go index 841bedc42..08b9a374f 100644 --- a/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go +++ b/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go @@ -5,9 +5,9 @@ package findMyDealedCurrentTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findMyDealedImgResources/data.go b/iSolarCloud/WebAppService/findMyDealedImgResources/data.go index 9df977815..341339ccf 100644 --- a/iSolarCloud/WebAppService/findMyDealedImgResources/data.go +++ b/iSolarCloud/WebAppService/findMyDealedImgResources/data.go @@ -1,11 +1,12 @@ package findMyDealedImgResources import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/findMyDealedImgResources" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go b/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go index d36599875..de3175fe5 100644 --- a/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go +++ b/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go @@ -5,9 +5,9 @@ package findMyDealedImgResources import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findSeriesInverterData/data.go b/iSolarCloud/WebAppService/findSeriesInverterData/data.go index 72f8212ab..531e20952 100644 --- a/iSolarCloud/WebAppService/findSeriesInverterData/data.go +++ b/iSolarCloud/WebAppService/findSeriesInverterData/data.go @@ -1,11 +1,12 @@ package findSeriesInverterData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/findSeriesInverterData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findSeriesInverterData/struct.go b/iSolarCloud/WebAppService/findSeriesInverterData/struct.go index 0eb244f3e..a25be643e 100644 --- a/iSolarCloud/WebAppService/findSeriesInverterData/struct.go +++ b/iSolarCloud/WebAppService/findSeriesInverterData/struct.go @@ -5,9 +5,9 @@ package findSeriesInverterData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/findWebRole/data.go b/iSolarCloud/WebAppService/findWebRole/data.go index a29fa6068..f2142ec83 100644 --- a/iSolarCloud/WebAppService/findWebRole/data.go +++ b/iSolarCloud/WebAppService/findWebRole/data.go @@ -1,11 +1,12 @@ package findWebRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/findWebRole" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/findWebRole/struct.go b/iSolarCloud/WebAppService/findWebRole/struct.go index cab6f5ba1..7f4746979 100644 --- a/iSolarCloud/WebAppService/findWebRole/struct.go +++ b/iSolarCloud/WebAppService/findWebRole/struct.go @@ -5,9 +5,9 @@ package findWebRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getAllPsFaultCount/data.go b/iSolarCloud/WebAppService/getAllPsFaultCount/data.go index 2fc35eb07..f0b109370 100644 --- a/iSolarCloud/WebAppService/getAllPsFaultCount/data.go +++ b/iSolarCloud/WebAppService/getAllPsFaultCount/data.go @@ -1,11 +1,12 @@ package getAllPsFaultCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getAllPsFaultCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go b/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go index 55a0ed174..c266aa55b 100644 --- a/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go +++ b/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go @@ -5,9 +5,9 @@ package getAllPsFaultCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go index b48817e84..42bb4461d 100644 --- a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go +++ b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go @@ -1,11 +1,12 @@ package getAllPsFaultCountByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getAllPsFaultCountByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go index 1f8953e5d..9c5608056 100644 --- a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go +++ b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go @@ -5,9 +5,9 @@ package getAllPsFaultCountByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getAllPsList/data.go b/iSolarCloud/WebAppService/getAllPsList/data.go index 98a8d3588..65a4d5949 100644 --- a/iSolarCloud/WebAppService/getAllPsList/data.go +++ b/iSolarCloud/WebAppService/getAllPsList/data.go @@ -1,11 +1,12 @@ package getAllPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getAllPsList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getAllPsList/struct.go b/iSolarCloud/WebAppService/getAllPsList/struct.go index f6ecd8fac..f52accd08 100644 --- a/iSolarCloud/WebAppService/getAllPsList/struct.go +++ b/iSolarCloud/WebAppService/getAllPsList/struct.go @@ -5,9 +5,9 @@ package getAllPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getAllStore/data.go b/iSolarCloud/WebAppService/getAllStore/data.go index cb40517db..8ba9e459a 100644 --- a/iSolarCloud/WebAppService/getAllStore/data.go +++ b/iSolarCloud/WebAppService/getAllStore/data.go @@ -1,11 +1,12 @@ package getAllStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getAllStore" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getAllStore/struct.go b/iSolarCloud/WebAppService/getAllStore/struct.go index c622c5fe4..c5b6649f4 100644 --- a/iSolarCloud/WebAppService/getAllStore/struct.go +++ b/iSolarCloud/WebAppService/getAllStore/struct.go @@ -5,9 +5,9 @@ package getAllStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go b/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go index fb9c545c7..a3f195765 100644 --- a/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go +++ b/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go @@ -1,11 +1,12 @@ package getBaseDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getBaseDeviceInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go b/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go index 1eb5d98a8..a794d85fe 100644 --- a/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go +++ b/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go @@ -5,9 +5,9 @@ package getBaseDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getBoxData/data.go b/iSolarCloud/WebAppService/getBoxData/data.go index b6b486d4f..bfaecda74 100644 --- a/iSolarCloud/WebAppService/getBoxData/data.go +++ b/iSolarCloud/WebAppService/getBoxData/data.go @@ -1,11 +1,12 @@ package getBoxData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getBoxData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getBoxData/struct.go b/iSolarCloud/WebAppService/getBoxData/struct.go index b97972ebb..9878b7ef1 100644 --- a/iSolarCloud/WebAppService/getBoxData/struct.go +++ b/iSolarCloud/WebAppService/getBoxData/struct.go @@ -5,9 +5,9 @@ package getBoxData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getCBoxTree/data.go b/iSolarCloud/WebAppService/getCBoxTree/data.go index 479836208..b522322f0 100644 --- a/iSolarCloud/WebAppService/getCBoxTree/data.go +++ b/iSolarCloud/WebAppService/getCBoxTree/data.go @@ -1,11 +1,12 @@ package getCBoxTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getCBoxTree" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getCBoxTree/struct.go b/iSolarCloud/WebAppService/getCBoxTree/struct.go index d1b15e5e7..5b3e41cbc 100644 --- a/iSolarCloud/WebAppService/getCBoxTree/struct.go +++ b/iSolarCloud/WebAppService/getCBoxTree/struct.go @@ -5,9 +5,9 @@ package getCBoxTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getCheckDevTypeList/data.go b/iSolarCloud/WebAppService/getCheckDevTypeList/data.go index bf67db5b8..64da37084 100644 --- a/iSolarCloud/WebAppService/getCheckDevTypeList/data.go +++ b/iSolarCloud/WebAppService/getCheckDevTypeList/data.go @@ -1,11 +1,12 @@ package getCheckDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getCheckDevTypeList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go b/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go index cf0427f46..d8abb2cc1 100644 --- a/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go +++ b/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go @@ -5,9 +5,9 @@ package getCheckDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getCheckUserList/data.go b/iSolarCloud/WebAppService/getCheckUserList/data.go index c89f0e39a..f9da82c62 100644 --- a/iSolarCloud/WebAppService/getCheckUserList/data.go +++ b/iSolarCloud/WebAppService/getCheckUserList/data.go @@ -1,11 +1,12 @@ package getCheckUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getCheckUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getCheckUserList/struct.go b/iSolarCloud/WebAppService/getCheckUserList/struct.go index 5cee05cfa..3555b1af9 100644 --- a/iSolarCloud/WebAppService/getCheckUserList/struct.go +++ b/iSolarCloud/WebAppService/getCheckUserList/struct.go @@ -5,9 +5,9 @@ package getCheckUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getChildOrg/data.go b/iSolarCloud/WebAppService/getChildOrg/data.go index a7000d9bc..c717ea129 100644 --- a/iSolarCloud/WebAppService/getChildOrg/data.go +++ b/iSolarCloud/WebAppService/getChildOrg/data.go @@ -1,11 +1,12 @@ package getChildOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getChildOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getChildOrg/struct.go b/iSolarCloud/WebAppService/getChildOrg/struct.go index 5ea8e331f..c32ac2007 100644 --- a/iSolarCloud/WebAppService/getChildOrg/struct.go +++ b/iSolarCloud/WebAppService/getChildOrg/struct.go @@ -5,9 +5,9 @@ package getChildOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getCo/data.go b/iSolarCloud/WebAppService/getCo/data.go index f6f8195ed..cc5305bbe 100644 --- a/iSolarCloud/WebAppService/getCo/data.go +++ b/iSolarCloud/WebAppService/getCo/data.go @@ -1,11 +1,12 @@ package getCo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getCo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getCo/struct.go b/iSolarCloud/WebAppService/getCo/struct.go index e4dbc3b9b..8e129b623 100644 --- a/iSolarCloud/WebAppService/getCo/struct.go +++ b/iSolarCloud/WebAppService/getCo/struct.go @@ -5,9 +5,9 @@ package getCo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getCodeTreeMap/data.go b/iSolarCloud/WebAppService/getCodeTreeMap/data.go index a757ba807..5acd21aae 100644 --- a/iSolarCloud/WebAppService/getCodeTreeMap/data.go +++ b/iSolarCloud/WebAppService/getCodeTreeMap/data.go @@ -1,11 +1,12 @@ package getCodeTreeMap import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCodeTreeMap" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getCodeTreeMap/struct.go b/iSolarCloud/WebAppService/getCodeTreeMap/struct.go index 5806e4bf6..6c6026722 100644 --- a/iSolarCloud/WebAppService/getCodeTreeMap/struct.go +++ b/iSolarCloud/WebAppService/getCodeTreeMap/struct.go @@ -5,9 +5,9 @@ package getCodeTreeMap import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDST/data.go b/iSolarCloud/WebAppService/getDST/data.go index a3c3a1934..b4a3d5fcf 100644 --- a/iSolarCloud/WebAppService/getDST/data.go +++ b/iSolarCloud/WebAppService/getDST/data.go @@ -1,11 +1,12 @@ package getDST import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getDST" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDST/struct.go b/iSolarCloud/WebAppService/getDST/struct.go index 45be11d58..6d39a21bb 100644 --- a/iSolarCloud/WebAppService/getDST/struct.go +++ b/iSolarCloud/WebAppService/getDST/struct.go @@ -5,9 +5,9 @@ package getDST import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDataCounts/data.go b/iSolarCloud/WebAppService/getDataCounts/data.go index 2a7597a2e..463450241 100644 --- a/iSolarCloud/WebAppService/getDataCounts/data.go +++ b/iSolarCloud/WebAppService/getDataCounts/data.go @@ -1,11 +1,12 @@ package getDataCounts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getDataCounts" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDataCounts/struct.go b/iSolarCloud/WebAppService/getDataCounts/struct.go index f90117fd7..9024c1306 100644 --- a/iSolarCloud/WebAppService/getDataCounts/struct.go +++ b/iSolarCloud/WebAppService/getDataCounts/struct.go @@ -5,9 +5,9 @@ package getDataCounts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDataInfo/data.go b/iSolarCloud/WebAppService/getDataInfo/data.go index d659bb833..57f4bbfc7 100644 --- a/iSolarCloud/WebAppService/getDataInfo/data.go +++ b/iSolarCloud/WebAppService/getDataInfo/data.go @@ -1,11 +1,12 @@ package getDataInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getDataInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDataInfo/struct.go b/iSolarCloud/WebAppService/getDataInfo/struct.go index d14edc295..f34aa904f 100644 --- a/iSolarCloud/WebAppService/getDataInfo/struct.go +++ b/iSolarCloud/WebAppService/getDataInfo/struct.go @@ -5,9 +5,9 @@ package getDataInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDevList/data.go b/iSolarCloud/WebAppService/getDevList/data.go index 5d50b9ca0..074042044 100644 --- a/iSolarCloud/WebAppService/getDevList/data.go +++ b/iSolarCloud/WebAppService/getDevList/data.go @@ -1,11 +1,12 @@ package getDevList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDevList/struct.go b/iSolarCloud/WebAppService/getDevList/struct.go index 72718bec1..7a0216750 100644 --- a/iSolarCloud/WebAppService/getDevList/struct.go +++ b/iSolarCloud/WebAppService/getDevList/struct.go @@ -5,9 +5,9 @@ package getDevList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDevName/data.go b/iSolarCloud/WebAppService/getDevName/data.go index 422255867..77af34c2a 100644 --- a/iSolarCloud/WebAppService/getDevName/data.go +++ b/iSolarCloud/WebAppService/getDevName/data.go @@ -1,11 +1,12 @@ package getDevName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevName" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDevName/struct.go b/iSolarCloud/WebAppService/getDevName/struct.go index 5f1730723..de05fb7b1 100644 --- a/iSolarCloud/WebAppService/getDevName/struct.go +++ b/iSolarCloud/WebAppService/getDevName/struct.go @@ -5,9 +5,9 @@ package getDevName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDevTypeList/data.go b/iSolarCloud/WebAppService/getDevTypeList/data.go index af6f2454c..d8c4488f8 100644 --- a/iSolarCloud/WebAppService/getDevTypeList/data.go +++ b/iSolarCloud/WebAppService/getDevTypeList/data.go @@ -1,11 +1,12 @@ package getDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevTypeList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDevTypeList/struct.go b/iSolarCloud/WebAppService/getDevTypeList/struct.go index 5bacf94d4..0d5dde811 100644 --- a/iSolarCloud/WebAppService/getDevTypeList/struct.go +++ b/iSolarCloud/WebAppService/getDevTypeList/struct.go @@ -5,9 +5,9 @@ package getDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDeviceDataList/data.go b/iSolarCloud/WebAppService/getDeviceDataList/data.go index 95855f4c9..45acf439c 100644 --- a/iSolarCloud/WebAppService/getDeviceDataList/data.go +++ b/iSolarCloud/WebAppService/getDeviceDataList/data.go @@ -1,8 +1,8 @@ package getDeviceDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/WebAppService/getDeviceDataList/struct.go b/iSolarCloud/WebAppService/getDeviceDataList/struct.go index f31062d4f..c66f639a8 100644 --- a/iSolarCloud/WebAppService/getDeviceDataList/struct.go +++ b/iSolarCloud/WebAppService/getDeviceDataList/struct.go @@ -5,9 +5,9 @@ package getDeviceDataList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDeviceFactory/data.go b/iSolarCloud/WebAppService/getDeviceFactory/data.go index 30dbe0dec..023dc20c9 100644 --- a/iSolarCloud/WebAppService/getDeviceFactory/data.go +++ b/iSolarCloud/WebAppService/getDeviceFactory/data.go @@ -1,11 +1,12 @@ package getDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceFactory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDeviceFactory/struct.go b/iSolarCloud/WebAppService/getDeviceFactory/struct.go index 16134db1d..a532d37dc 100644 --- a/iSolarCloud/WebAppService/getDeviceFactory/struct.go +++ b/iSolarCloud/WebAppService/getDeviceFactory/struct.go @@ -5,9 +5,9 @@ package getDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go b/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go index 5c1278fc4..be068cb4f 100644 --- a/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go +++ b/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go @@ -1,11 +1,12 @@ package getDeviceInfoForCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceInfoForCheck" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go b/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go index 905f49e6a..24b67ea56 100644 --- a/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go +++ b/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go @@ -5,9 +5,9 @@ package getDeviceInfoForCheck import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDevicePointAttrs/data.go b/iSolarCloud/WebAppService/getDevicePointAttrs/data.go index ae73c180a..83ad87c9d 100644 --- a/iSolarCloud/WebAppService/getDevicePointAttrs/data.go +++ b/iSolarCloud/WebAppService/getDevicePointAttrs/data.go @@ -1,10 +1,11 @@ package getDevicePointAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -124,92 +125,91 @@ func (m *PointsMap) Get(point string) *Point { return nil } - type UnitTypes map[string]string -var unitTypes = UnitTypes { - "": "Unknown", // - "NULL": "Unknown", // +var unitTypes = UnitTypes{ + "": "Unknown", // + "NULL": "Unknown", // - "%": "Percent", // 10 - "%RH": "Humidity", // 12 + "%": "Percent", // 10 + "%RH": "Humidity", // 12 - "A": "Current", // - "Ah": "Current Capacity", // - "mA": "Current", // + "A": "Current", // + "Ah": "Current Capacity", // + "mA": "Current", // - "Bar": "Pressure", // - "hPa": "Pressure", // 19 + "Bar": "Pressure", // + "hPa": "Pressure", // 19 - "Day": "Date/Time", // 15 - "H": "Date/Time", // 15 - "Hour": "Date/Time", // 15 - "h": "Date/Time", // 15 - "Year": "Date/Time", // 15 - "Min": "Date/Time", // 15 - "Mon": "Date/Time", // 15 - "min": "Date/Time", // 15 - "s": "Date/Time", // 15 + "Day": "Date/Time", // 15 + "H": "Date/Time", // 15 + "Hour": "Date/Time", // 15 + "h": "Date/Time", // 15 + "Year": "Date/Time", // 15 + "Min": "Date/Time", // 15 + "Mon": "Date/Time", // 15 + "min": "Date/Time", // 15 + "s": "Date/Time", // 15 - "Hz": "Frequency", // + "Hz": "Frequency", // - "KV": "Voltage", // - "kV ": "Voltage", // - "kV": "Voltage", // - "V": "Voltage", // - "mV": "Voltage", // + "KV": "Voltage", // + "kV ": "Voltage", // + "kV": "Voltage", // + "V": "Voltage", // + "mV": "Voltage", // - "MAh": "Energy", // 13 - "MWh": "Energy", // - "MWp": "Energy", // - "Wh": "Energy", // - "kWh": "Energy", // + "MAh": "Energy", // 13 + "MWh": "Energy", // + "MWp": "Energy", // + "Wh": "Energy", // + "kWh": "Energy", // - "MW": "Power", // - "kW": "Power", // 0 / 21 - "W": "Power", // + "MW": "Power", // + "kW": "Power", // 0 / 21 + "W": "Power", // - "Mvar": "Reactive Power", // - "kVar": "Reactive Power", // - "kvar": "Reactive Power", // - "Var": "Reactive Power", // + "Mvar": "Reactive Power", // + "kVar": "Reactive Power", // + "kvar": "Reactive Power", // + "Var": "Reactive Power", // - "VA": "Apparent Power", // 21 - "kVA": "Apparent Power", // 21 + "VA": "Apparent Power", // 21 + "kVA": "Apparent Power", // 21 - "kW/kWp": "Power Normalization", // + "kW/kWp": "Power Normalization", // - "kVarh": "Reactive Electricity", // - "kvarh": "Reactive Electricity", // + "kVarh": "Reactive Electricity", // + "kvarh": "Reactive Electricity", // - "PCS": "PCS", // + "PCS": "PCS", // - "V/mA": "Output", // 0 + "V/mA": "Output", // 0 - "W/㎡": "Irradiation", // - "Wh/㎡": "Irradiation", // 1 + "W/㎡": "Irradiation", // + "Wh/㎡": "Irradiation", // 1 - "dec": "dec", // + "dec": "dec", // - "g": "Weight", // 17 - "kg": "Weight", // 17 + "g": "Weight", // 17 + "kg": "Weight", // 17 - "kΩ": "Resistance", // + "kΩ": "Resistance", // - "m/s": "Speed", // - "r/min": "Speed", // + "m/s": "Speed", // + "r/min": "Speed", // - "mm": "Length", // + "mm": "Length", // - "°": "Angle", // + "°": "Angle", // - "℃": "Temperature", // 2 + "℃": "Temperature", // 2 - "时": "Date/Time", // 15 - "分": "Date/Time", // Operation Minutes - "台": "Count", // Number of Online PCSs - "排": "Count", // - "次": "Count", // Discharging Count + "时": "Date/Time", // 15 + "分": "Date/Time", // Operation Minutes + "台": "Count", // Number of Online PCSs + "排": "Count", // + "次": "Count", // Discharging Count } // 21 = kW @@ -282,7 +282,6 @@ func (ut *UnitTypes) Get(name string) string { return name } - type PointGroupNames map[string]string var pointGroupNames = PointGroupNames{ diff --git a/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go b/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go index 904fc8970..2ff21d022 100644 --- a/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go +++ b/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go @@ -5,9 +5,9 @@ package getDevicePointAttrs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDeviceTreeChild/data.go b/iSolarCloud/WebAppService/getDeviceTreeChild/data.go index a9a65dc0c..5c8003179 100644 --- a/iSolarCloud/WebAppService/getDeviceTreeChild/data.go +++ b/iSolarCloud/WebAppService/getDeviceTreeChild/data.go @@ -1,11 +1,12 @@ package getDeviceTreeChild import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceTreeChild" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go b/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go index 1849b8937..6e2a605d2 100644 --- a/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go +++ b/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go @@ -5,9 +5,9 @@ package getDeviceTreeChild import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDeviceUuid/data.go b/iSolarCloud/WebAppService/getDeviceUuid/data.go index 0a97afb71..4a52d75c5 100644 --- a/iSolarCloud/WebAppService/getDeviceUuid/data.go +++ b/iSolarCloud/WebAppService/getDeviceUuid/data.go @@ -1,11 +1,12 @@ package getDeviceUuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceUuid" diff --git a/iSolarCloud/WebAppService/getDeviceUuid/struct.go b/iSolarCloud/WebAppService/getDeviceUuid/struct.go index 3fdfe9726..59fc8ebec 100644 --- a/iSolarCloud/WebAppService/getDeviceUuid/struct.go +++ b/iSolarCloud/WebAppService/getDeviceUuid/struct.go @@ -5,9 +5,9 @@ package getDeviceUuid import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDutyInfoById/data.go b/iSolarCloud/WebAppService/getDutyInfoById/data.go index 4603010ae..e433d9801 100644 --- a/iSolarCloud/WebAppService/getDutyInfoById/data.go +++ b/iSolarCloud/WebAppService/getDutyInfoById/data.go @@ -1,11 +1,12 @@ package getDutyInfoById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getDutyInfoById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDutyInfoById/struct.go b/iSolarCloud/WebAppService/getDutyInfoById/struct.go index ba6b8bb61..b36c2b401 100644 --- a/iSolarCloud/WebAppService/getDutyInfoById/struct.go +++ b/iSolarCloud/WebAppService/getDutyInfoById/struct.go @@ -5,9 +5,9 @@ package getDutyInfoById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getDutyOrgZtree/data.go b/iSolarCloud/WebAppService/getDutyOrgZtree/data.go index f62bff340..d663f1f3d 100644 --- a/iSolarCloud/WebAppService/getDutyOrgZtree/data.go +++ b/iSolarCloud/WebAppService/getDutyOrgZtree/data.go @@ -1,11 +1,12 @@ package getDutyOrgZtree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getDutyOrgZtree" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go b/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go index 289da6c2d..4ae003e13 100644 --- a/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go +++ b/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go @@ -5,9 +5,9 @@ package getDutyOrgZtree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getElecEffectList/data.go b/iSolarCloud/WebAppService/getElecEffectList/data.go index 97a88567d..9ac5e70d5 100644 --- a/iSolarCloud/WebAppService/getElecEffectList/data.go +++ b/iSolarCloud/WebAppService/getElecEffectList/data.go @@ -1,11 +1,12 @@ package getElecEffectList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getElecEffectList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getElecEffectList/struct.go b/iSolarCloud/WebAppService/getElecEffectList/struct.go index aca05ab60..bb47d417a 100644 --- a/iSolarCloud/WebAppService/getElecEffectList/struct.go +++ b/iSolarCloud/WebAppService/getElecEffectList/struct.go @@ -5,9 +5,9 @@ package getElecEffectList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getEnvironmentInfo/data.go b/iSolarCloud/WebAppService/getEnvironmentInfo/data.go index 271dca62c..a6e423145 100644 --- a/iSolarCloud/WebAppService/getEnvironmentInfo/data.go +++ b/iSolarCloud/WebAppService/getEnvironmentInfo/data.go @@ -1,11 +1,12 @@ package getEnvironmentInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getEnvironmentInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go b/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go index 54f4bfbe8..ef3e4306d 100644 --- a/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go +++ b/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go @@ -5,9 +5,9 @@ package getEnvironmentInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultList/data.go b/iSolarCloud/WebAppService/getFaultList/data.go index ab209006d..ac456e131 100644 --- a/iSolarCloud/WebAppService/getFaultList/data.go +++ b/iSolarCloud/WebAppService/getFaultList/data.go @@ -1,11 +1,12 @@ package getFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultList/struct.go b/iSolarCloud/WebAppService/getFaultList/struct.go index 5e40ed783..58ba449df 100644 --- a/iSolarCloud/WebAppService/getFaultList/struct.go +++ b/iSolarCloud/WebAppService/getFaultList/struct.go @@ -5,9 +5,9 @@ package getFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultName/data.go b/iSolarCloud/WebAppService/getFaultName/data.go index f22093956..5ba501f74 100644 --- a/iSolarCloud/WebAppService/getFaultName/data.go +++ b/iSolarCloud/WebAppService/getFaultName/data.go @@ -1,11 +1,12 @@ package getFaultName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultName" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultName/struct.go b/iSolarCloud/WebAppService/getFaultName/struct.go index 54565cf61..82d8a6e9e 100644 --- a/iSolarCloud/WebAppService/getFaultName/struct.go +++ b/iSolarCloud/WebAppService/getFaultName/struct.go @@ -5,9 +5,9 @@ package getFaultName import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultOrder/data.go b/iSolarCloud/WebAppService/getFaultOrder/data.go index 96d3d594e..d6c8d9322 100644 --- a/iSolarCloud/WebAppService/getFaultOrder/data.go +++ b/iSolarCloud/WebAppService/getFaultOrder/data.go @@ -1,11 +1,12 @@ package getFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultOrder" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultOrder/struct.go b/iSolarCloud/WebAppService/getFaultOrder/struct.go index 7271e8088..018e43c7b 100644 --- a/iSolarCloud/WebAppService/getFaultOrder/struct.go +++ b/iSolarCloud/WebAppService/getFaultOrder/struct.go @@ -5,9 +5,9 @@ package getFaultOrder import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go b/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go index 4e86d612d..4e3ff0bee 100644 --- a/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go +++ b/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go @@ -1,11 +1,12 @@ package getFaultOrderByOrderId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultOrderByOrderId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go b/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go index f9507ed54..1df138d06 100644 --- a/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go +++ b/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go @@ -5,9 +5,9 @@ package getFaultOrderByOrderId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultOrderList/data.go b/iSolarCloud/WebAppService/getFaultOrderList/data.go index 4d402f540..20ae531f3 100644 --- a/iSolarCloud/WebAppService/getFaultOrderList/data.go +++ b/iSolarCloud/WebAppService/getFaultOrderList/data.go @@ -1,11 +1,12 @@ package getFaultOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultOrderList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultOrderList/struct.go b/iSolarCloud/WebAppService/getFaultOrderList/struct.go index 1c09a1092..78ff6a5f2 100644 --- a/iSolarCloud/WebAppService/getFaultOrderList/struct.go +++ b/iSolarCloud/WebAppService/getFaultOrderList/struct.go @@ -5,9 +5,9 @@ package getFaultOrderList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getFaultOrderStepList/data.go b/iSolarCloud/WebAppService/getFaultOrderStepList/data.go index 1594df3b0..50eaf1ae5 100644 --- a/iSolarCloud/WebAppService/getFaultOrderStepList/data.go +++ b/iSolarCloud/WebAppService/getFaultOrderStepList/data.go @@ -1,11 +1,12 @@ package getFaultOrderStepList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getFaultOrderStepList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go b/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go index 8df80a625..7cfa08415 100644 --- a/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go +++ b/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go @@ -5,9 +5,9 @@ package getFaultOrderStepList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getHTRoleList/data.go b/iSolarCloud/WebAppService/getHTRoleList/data.go index 60100d953..3efea17f6 100644 --- a/iSolarCloud/WebAppService/getHTRoleList/data.go +++ b/iSolarCloud/WebAppService/getHTRoleList/data.go @@ -1,11 +1,12 @@ package getHTRoleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getHTRoleList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getHTRoleList/struct.go b/iSolarCloud/WebAppService/getHTRoleList/struct.go index 6575aa6cc..a03162304 100644 --- a/iSolarCloud/WebAppService/getHTRoleList/struct.go +++ b/iSolarCloud/WebAppService/getHTRoleList/struct.go @@ -5,9 +5,9 @@ package getHTRoleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getHistoryComments/data.go b/iSolarCloud/WebAppService/getHistoryComments/data.go index 1f7076905..1f031d563 100644 --- a/iSolarCloud/WebAppService/getHistoryComments/data.go +++ b/iSolarCloud/WebAppService/getHistoryComments/data.go @@ -1,11 +1,12 @@ package getHistoryComments import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getHistoryComments" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getHistoryComments/struct.go b/iSolarCloud/WebAppService/getHistoryComments/struct.go index 30506de48..0a081bbec 100644 --- a/iSolarCloud/WebAppService/getHistoryComments/struct.go +++ b/iSolarCloud/WebAppService/getHistoryComments/struct.go @@ -5,9 +5,9 @@ package getHistoryComments import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInfo/data.go b/iSolarCloud/WebAppService/getInfo/data.go index fbec0ea47..30de948d0 100644 --- a/iSolarCloud/WebAppService/getInfo/data.go +++ b/iSolarCloud/WebAppService/getInfo/data.go @@ -1,11 +1,12 @@ package getInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getInfo/struct.go b/iSolarCloud/WebAppService/getInfo/struct.go index 72a7bd23f..4ab9ac621 100644 --- a/iSolarCloud/WebAppService/getInfo/struct.go +++ b/iSolarCloud/WebAppService/getInfo/struct.go @@ -5,9 +5,9 @@ package getInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInverteTableListCount/data.go b/iSolarCloud/WebAppService/getInverteTableListCount/data.go index dfd05b612..cfc5fc7ba 100644 --- a/iSolarCloud/WebAppService/getInverteTableListCount/data.go +++ b/iSolarCloud/WebAppService/getInverteTableListCount/data.go @@ -1,11 +1,12 @@ package getInverteTableListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getInverteTableListCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getInverteTableListCount/struct.go b/iSolarCloud/WebAppService/getInverteTableListCount/struct.go index 5b87cddc3..25a1e8c8c 100644 --- a/iSolarCloud/WebAppService/getInverteTableListCount/struct.go +++ b/iSolarCloud/WebAppService/getInverteTableListCount/struct.go @@ -5,9 +5,9 @@ package getInverteTableListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go index 786eb7c01..096a804c9 100644 --- a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go +++ b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go @@ -1,11 +1,12 @@ package getInverterDiscreteDistributioList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getInverterDiscreteDistributioList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go index 79c99ca68..0785c4546 100644 --- a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go +++ b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go @@ -5,9 +5,9 @@ package getInverterDiscreteDistributioList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInverterDiscreteList/data.go b/iSolarCloud/WebAppService/getInverterDiscreteList/data.go index 4323fe8f1..148cd4beb 100644 --- a/iSolarCloud/WebAppService/getInverterDiscreteList/data.go +++ b/iSolarCloud/WebAppService/getInverterDiscreteList/data.go @@ -1,11 +1,12 @@ package getInverterDiscreteList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getInverterDiscreteList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go b/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go index 134541bee..f78883ed9 100644 --- a/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go +++ b/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go @@ -5,9 +5,9 @@ package getInverterDiscreteList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInverterFactoryList/data.go b/iSolarCloud/WebAppService/getInverterFactoryList/data.go index 6675a34a8..9efabd380 100644 --- a/iSolarCloud/WebAppService/getInverterFactoryList/data.go +++ b/iSolarCloud/WebAppService/getInverterFactoryList/data.go @@ -1,11 +1,12 @@ package getInverterFactoryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getInverterFactoryList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getInverterFactoryList/struct.go b/iSolarCloud/WebAppService/getInverterFactoryList/struct.go index 01e4294ac..a04a3d354 100644 --- a/iSolarCloud/WebAppService/getInverterFactoryList/struct.go +++ b/iSolarCloud/WebAppService/getInverterFactoryList/struct.go @@ -5,9 +5,9 @@ package getInverterFactoryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getInverterInfo/data.go b/iSolarCloud/WebAppService/getInverterInfo/data.go index d1709511f..676e44387 100644 --- a/iSolarCloud/WebAppService/getInverterInfo/data.go +++ b/iSolarCloud/WebAppService/getInverterInfo/data.go @@ -1,11 +1,12 @@ package getInverterInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -14,7 +15,7 @@ const Disabled = false const EndPointName = "WebAppService.getInverterInfo" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } @@ -36,7 +36,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebAppService/getInverterInfo/struct.go b/iSolarCloud/WebAppService/getInverterInfo/struct.go index 25f050a29..09beb2d4b 100644 --- a/iSolarCloud/WebAppService/getInverterInfo/struct.go +++ b/iSolarCloud/WebAppService/getInverterInfo/struct.go @@ -5,9 +5,9 @@ package getInverterInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getLoadCurveList/data.go b/iSolarCloud/WebAppService/getLoadCurveList/data.go index e4845ad8f..efa96570b 100644 --- a/iSolarCloud/WebAppService/getLoadCurveList/data.go +++ b/iSolarCloud/WebAppService/getLoadCurveList/data.go @@ -1,9 +1,9 @@ package getLoadCurveList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "WebAppService.getLoadCurveList" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` MonthDate2 valueTypes.Integer `json:"monthDate" required:"true"` } @@ -26,9 +26,9 @@ func (rd RequestData) Help() string { return ret } -type ResultData struct { - DayList []interface{} `json:"dayList"` - PsKey valueTypes.String `json:"psKey"` +type ResultData struct { + DayList []interface{} `json:"dayList"` + PsKey valueTypes.String `json:"psKey"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/WebAppService/getLoadCurveList/struct.go b/iSolarCloud/WebAppService/getLoadCurveList/struct.go index d47da8a8a..ebac5a66f 100644 --- a/iSolarCloud/WebAppService/getLoadCurveList/struct.go +++ b/iSolarCloud/WebAppService/getLoadCurveList/struct.go @@ -5,9 +5,9 @@ package getLoadCurveList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go index b11d81e8a..cc8de3388 100644 --- a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go +++ b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go @@ -1,12 +1,12 @@ package getMqttConfigInfoByAppkey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" +) const Url = "/v1/commonService/getMqttConfigInfoByAppkey" const Disabled = false @@ -35,13 +35,13 @@ func (rd RequestData) Help() string { // ResultData holds data returned from the API. type ResultData struct { - Code string `json:"code"` - MqttPassword string `json:"mqtt_password"` - MqttRsaPublicKey string `json:"mqtt_rsa_public_key"` - MqttType string `json:"mqtt_type"` + Code string `json:"code"` + MqttPassword string `json:"mqtt_password"` + MqttRsaPublicKey string `json:"mqtt_rsa_public_key"` + MqttType string `json:"mqtt_type"` MqttURLList []valueTypes.String `json:"mqtt_url_list"` MqttURLListLan []valueTypes.String `json:"mqtt_url_list_lan"` - MqttUsername string `json:"mqtt_username"` + MqttUsername string `json:"mqtt_username"` } // IsValid Checks for validity of results data. diff --git a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go index 73d79bbaa..4fee8a64e 100644 --- a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go +++ b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go @@ -5,9 +5,9 @@ package getMqttConfigInfoByAppkey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getMultiPowers/data.go b/iSolarCloud/WebAppService/getMultiPowers/data.go index 5af0e4482..c4a518f92 100644 --- a/iSolarCloud/WebAppService/getMultiPowers/data.go +++ b/iSolarCloud/WebAppService/getMultiPowers/data.go @@ -1,10 +1,11 @@ package getMultiPowers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "WebAppService.getMultiPowers" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { } diff --git a/iSolarCloud/WebAppService/getMultiPowers/struct.go b/iSolarCloud/WebAppService/getMultiPowers/struct.go index 970004e85..fde9d347d 100644 --- a/iSolarCloud/WebAppService/getMultiPowers/struct.go +++ b/iSolarCloud/WebAppService/getMultiPowers/struct.go @@ -5,9 +5,9 @@ package getMultiPowers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOndutyQuery/data.go b/iSolarCloud/WebAppService/getOndutyQuery/data.go index 5fbfc3d7f..e8bdcb3bf 100644 --- a/iSolarCloud/WebAppService/getOndutyQuery/data.go +++ b/iSolarCloud/WebAppService/getOndutyQuery/data.go @@ -1,11 +1,12 @@ package getOndutyQuery import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getOndutyQuery" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOndutyQuery/struct.go b/iSolarCloud/WebAppService/getOndutyQuery/struct.go index eca47fd16..6562f3616 100644 --- a/iSolarCloud/WebAppService/getOndutyQuery/struct.go +++ b/iSolarCloud/WebAppService/getOndutyQuery/struct.go @@ -5,9 +5,9 @@ package getOndutyQuery import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOperateTicketUserList/data.go b/iSolarCloud/WebAppService/getOperateTicketUserList/data.go index 22e2f458c..fe470e5f6 100644 --- a/iSolarCloud/WebAppService/getOperateTicketUserList/data.go +++ b/iSolarCloud/WebAppService/getOperateTicketUserList/data.go @@ -1,11 +1,12 @@ package getOperateTicketUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOperateTicketUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go b/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go index 47fd35985..e2ed41ef4 100644 --- a/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go +++ b/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go @@ -5,9 +5,9 @@ package getOperateTicketUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go b/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go index 39127ae16..2b1e04026 100644 --- a/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go +++ b/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go @@ -1,11 +1,12 @@ package getOptTicketsAttachments import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOptTicketsAttachments" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go b/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go index 94ada961e..286d6f4ad 100644 --- a/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go +++ b/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go @@ -5,9 +5,9 @@ package getOptTicketsAttachments import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOrderCount/data.go b/iSolarCloud/WebAppService/getOrderCount/data.go index 56d2d41ae..77b4e1fba 100644 --- a/iSolarCloud/WebAppService/getOrderCount/data.go +++ b/iSolarCloud/WebAppService/getOrderCount/data.go @@ -1,11 +1,12 @@ package getOrderCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOrderCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOrderCount/struct.go b/iSolarCloud/WebAppService/getOrderCount/struct.go index dfa5b2f96..a83abbb91 100644 --- a/iSolarCloud/WebAppService/getOrderCount/struct.go +++ b/iSolarCloud/WebAppService/getOrderCount/struct.go @@ -5,9 +5,9 @@ package getOrderCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOrderData/data.go b/iSolarCloud/WebAppService/getOrderData/data.go index 4061a338e..8e7201773 100644 --- a/iSolarCloud/WebAppService/getOrderData/data.go +++ b/iSolarCloud/WebAppService/getOrderData/data.go @@ -1,10 +1,11 @@ package getOrderData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } @@ -34,7 +34,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebAppService/getOrderData/struct.go b/iSolarCloud/WebAppService/getOrderData/struct.go index c9a848be5..eceeb4df0 100644 --- a/iSolarCloud/WebAppService/getOrderData/struct.go +++ b/iSolarCloud/WebAppService/getOrderData/struct.go @@ -5,9 +5,9 @@ package getOrderData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOrderDataSize/data.go b/iSolarCloud/WebAppService/getOrderDataSize/data.go index 34e5353d3..9beed936b 100644 --- a/iSolarCloud/WebAppService/getOrderDataSize/data.go +++ b/iSolarCloud/WebAppService/getOrderDataSize/data.go @@ -1,11 +1,12 @@ package getOrderDataSize import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOrderDataSize" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOrderDataSize/struct.go b/iSolarCloud/WebAppService/getOrderDataSize/struct.go index f3a27aec0..77e60f1f9 100644 --- a/iSolarCloud/WebAppService/getOrderDataSize/struct.go +++ b/iSolarCloud/WebAppService/getOrderDataSize/struct.go @@ -5,9 +5,9 @@ package getOrderDataSize import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go b/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go index 087d71fa3..98cabe331 100644 --- a/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go +++ b/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go @@ -1,11 +1,12 @@ package getOrgPsEquipmentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getOrgPsEquipmentList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go b/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go index 8b51e9e95..824cb2695 100644 --- a/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go +++ b/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go @@ -5,9 +5,9 @@ package getOrgPsEquipmentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go index b5c7998ba..c3af649d8 100644 --- a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go +++ b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go @@ -1,11 +1,12 @@ package getOrgPsPowerGenerationSummaryReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getOrgPsPowerGenerationSummaryReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go index 5c52a69bd..a1d32d06e 100644 --- a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go +++ b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go @@ -5,9 +5,9 @@ package getOrgPsPowerGenerationSummaryReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getParentUidChain/data.go b/iSolarCloud/WebAppService/getParentUidChain/data.go index b286d5e7e..dddfe512b 100644 --- a/iSolarCloud/WebAppService/getParentUidChain/data.go +++ b/iSolarCloud/WebAppService/getParentUidChain/data.go @@ -1,11 +1,12 @@ package getParentUidChain import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getParentUidChain" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getParentUidChain/struct.go b/iSolarCloud/WebAppService/getParentUidChain/struct.go index 087c35eff..17aa574ef 100644 --- a/iSolarCloud/WebAppService/getParentUidChain/struct.go +++ b/iSolarCloud/WebAppService/getParentUidChain/struct.go @@ -5,9 +5,9 @@ package getParentUidChain import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go b/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go index 14091fa9f..3a7b2e4d6 100644 --- a/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go +++ b/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go @@ -1,11 +1,12 @@ package getPowerKwhkwpList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerKwhkwpList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go b/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go index a9bedc3d1..429a85647 100644 --- a/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go +++ b/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go @@ -5,9 +5,9 @@ package getPowerKwhkwpList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerPrList/data.go b/iSolarCloud/WebAppService/getPowerPrList/data.go index aff81b718..15f249510 100644 --- a/iSolarCloud/WebAppService/getPowerPrList/data.go +++ b/iSolarCloud/WebAppService/getPowerPrList/data.go @@ -1,11 +1,12 @@ package getPowerPrList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerPrList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerPrList/struct.go b/iSolarCloud/WebAppService/getPowerPrList/struct.go index 408dc90a6..90007aa29 100644 --- a/iSolarCloud/WebAppService/getPowerPrList/struct.go +++ b/iSolarCloud/WebAppService/getPowerPrList/struct.go @@ -5,9 +5,9 @@ package getPowerPrList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go b/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go index d0872d6d4..d209a8f8d 100644 --- a/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go +++ b/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go @@ -1,11 +1,12 @@ package getPowerPredictionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getPowerPredictionInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go b/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go index d0cf4145a..f25d73edd 100644 --- a/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go +++ b/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go @@ -5,9 +5,9 @@ package getPowerPredictionInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerTrendDayData/data.go b/iSolarCloud/WebAppService/getPowerTrendDayData/data.go index ca54bc931..e5ced49b6 100644 --- a/iSolarCloud/WebAppService/getPowerTrendDayData/data.go +++ b/iSolarCloud/WebAppService/getPowerTrendDayData/data.go @@ -1,11 +1,12 @@ package getPowerTrendDayData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -27,7 +28,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go b/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go index e826b0543..2cb838071 100644 --- a/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go +++ b/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go @@ -5,9 +5,9 @@ package getPowerTrendDayData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go b/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go index 0f08555f2..667c623e0 100644 --- a/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go +++ b/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go @@ -1,11 +1,12 @@ package getPowerTrendMonthData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerTrendMonthData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go b/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go index 6164fb8e5..fd6223edd 100644 --- a/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go +++ b/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go @@ -5,9 +5,9 @@ package getPowerTrendMonthData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerTrendYearData/data.go b/iSolarCloud/WebAppService/getPowerTrendYearData/data.go index 9f7d63bcc..f3f5882ff 100644 --- a/iSolarCloud/WebAppService/getPowerTrendYearData/data.go +++ b/iSolarCloud/WebAppService/getPowerTrendYearData/data.go @@ -1,11 +1,12 @@ package getPowerTrendYearData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPowerTrendYearData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go b/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go index 3fcb15ecb..bdc0ed7aa 100644 --- a/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go +++ b/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go @@ -5,9 +5,9 @@ package getPowerTrendYearData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPowerValue/data.go b/iSolarCloud/WebAppService/getPowerValue/data.go index 80daa6020..75cf6571d 100644 --- a/iSolarCloud/WebAppService/getPowerValue/data.go +++ b/iSolarCloud/WebAppService/getPowerValue/data.go @@ -1,11 +1,12 @@ package getPowerValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getPowerValue" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPowerValue/struct.go b/iSolarCloud/WebAppService/getPowerValue/struct.go index 7cb61a162..a9085fbc7 100644 --- a/iSolarCloud/WebAppService/getPowerValue/struct.go +++ b/iSolarCloud/WebAppService/getPowerValue/struct.go @@ -5,9 +5,9 @@ package getPowerValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsBlock/data.go b/iSolarCloud/WebAppService/getPsBlock/data.go index 9c95e0de0..a51fc7613 100644 --- a/iSolarCloud/WebAppService/getPsBlock/data.go +++ b/iSolarCloud/WebAppService/getPsBlock/data.go @@ -1,11 +1,12 @@ package getPsBlock import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsBlock" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsBlock/struct.go b/iSolarCloud/WebAppService/getPsBlock/struct.go index f2ca8f054..356b050d8 100644 --- a/iSolarCloud/WebAppService/getPsBlock/struct.go +++ b/iSolarCloud/WebAppService/getPsBlock/struct.go @@ -5,9 +5,9 @@ package getPsBlock import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsBlockData/data.go b/iSolarCloud/WebAppService/getPsBlockData/data.go index d903b2f0a..9c11275f8 100644 --- a/iSolarCloud/WebAppService/getPsBlockData/data.go +++ b/iSolarCloud/WebAppService/getPsBlockData/data.go @@ -1,11 +1,12 @@ package getPsBlockData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsBlockData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsBlockData/struct.go b/iSolarCloud/WebAppService/getPsBlockData/struct.go index ca21597f3..52930de0b 100644 --- a/iSolarCloud/WebAppService/getPsBlockData/struct.go +++ b/iSolarCloud/WebAppService/getPsBlockData/struct.go @@ -5,9 +5,9 @@ package getPsBlockData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsBlockTree/data.go b/iSolarCloud/WebAppService/getPsBlockTree/data.go index a35d70891..c49429418 100644 --- a/iSolarCloud/WebAppService/getPsBlockTree/data.go +++ b/iSolarCloud/WebAppService/getPsBlockTree/data.go @@ -1,11 +1,12 @@ package getPsBlockTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsBlockTree" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsBlockTree/struct.go b/iSolarCloud/WebAppService/getPsBlockTree/struct.go index 4d7acb39b..a3a022705 100644 --- a/iSolarCloud/WebAppService/getPsBlockTree/struct.go +++ b/iSolarCloud/WebAppService/getPsBlockTree/struct.go @@ -5,9 +5,9 @@ package getPsBlockTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsBoxListCount/data.go b/iSolarCloud/WebAppService/getPsBoxListCount/data.go index 88a33e24c..ad1c2ffef 100644 --- a/iSolarCloud/WebAppService/getPsBoxListCount/data.go +++ b/iSolarCloud/WebAppService/getPsBoxListCount/data.go @@ -1,11 +1,12 @@ package getPsBoxListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsBoxListCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsBoxListCount/struct.go b/iSolarCloud/WebAppService/getPsBoxListCount/struct.go index 40a55a6c3..337ad0fe2 100644 --- a/iSolarCloud/WebAppService/getPsBoxListCount/struct.go +++ b/iSolarCloud/WebAppService/getPsBoxListCount/struct.go @@ -5,9 +5,9 @@ package getPsBoxListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsCBoxDetail/data.go b/iSolarCloud/WebAppService/getPsCBoxDetail/data.go index c026fd299..5c53692f0 100644 --- a/iSolarCloud/WebAppService/getPsCBoxDetail/data.go +++ b/iSolarCloud/WebAppService/getPsCBoxDetail/data.go @@ -1,9 +1,9 @@ package getPsCBoxDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -32,7 +32,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { } diff --git a/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go b/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go index edb910fd5..3cb794f56 100644 --- a/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go +++ b/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go @@ -5,9 +5,9 @@ package getPsCBoxDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsContact/data.go b/iSolarCloud/WebAppService/getPsContact/data.go index 7120bd96e..7282b416e 100644 --- a/iSolarCloud/WebAppService/getPsContact/data.go +++ b/iSolarCloud/WebAppService/getPsContact/data.go @@ -1,11 +1,12 @@ package getPsContact import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsContact" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsContact/struct.go b/iSolarCloud/WebAppService/getPsContact/struct.go index fe61dac0a..960f588ef 100644 --- a/iSolarCloud/WebAppService/getPsContact/struct.go +++ b/iSolarCloud/WebAppService/getPsContact/struct.go @@ -5,9 +5,9 @@ package getPsContact import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsDataVal/data.go b/iSolarCloud/WebAppService/getPsDataVal/data.go index 0958f94dc..1c3e83155 100644 --- a/iSolarCloud/WebAppService/getPsDataVal/data.go +++ b/iSolarCloud/WebAppService/getPsDataVal/data.go @@ -1,11 +1,12 @@ package getPsDataVal import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsDataVal" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsDataVal/struct.go b/iSolarCloud/WebAppService/getPsDataVal/struct.go index d735b9f71..5399f83c4 100644 --- a/iSolarCloud/WebAppService/getPsDataVal/struct.go +++ b/iSolarCloud/WebAppService/getPsDataVal/struct.go @@ -5,9 +5,9 @@ package getPsDataVal import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go b/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go index 7b463077b..79f6ca271 100644 --- a/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go +++ b/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go @@ -1,11 +1,12 @@ package getPsDeviceCheckList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPsDeviceCheckList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go b/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go index cc1c74e74..dba0716db 100644 --- a/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go +++ b/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go @@ -5,9 +5,9 @@ package getPsDeviceCheckList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go b/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go index 1fcc6f1e4..76824d3b5 100644 --- a/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go +++ b/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go @@ -1,11 +1,12 @@ package getPsDeviceFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getPsDeviceFaultList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go b/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go index 05ce80dec..80520cea0 100644 --- a/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go +++ b/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go @@ -5,9 +5,9 @@ package getPsDeviceFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsFaultList/data.go b/iSolarCloud/WebAppService/getPsFaultList/data.go index 4f3721d75..f1c798aff 100644 --- a/iSolarCloud/WebAppService/getPsFaultList/data.go +++ b/iSolarCloud/WebAppService/getPsFaultList/data.go @@ -1,11 +1,12 @@ package getPsFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getPsFaultList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsFaultList/struct.go b/iSolarCloud/WebAppService/getPsFaultList/struct.go index 7fa8d0cd6..180b42475 100644 --- a/iSolarCloud/WebAppService/getPsFaultList/struct.go +++ b/iSolarCloud/WebAppService/getPsFaultList/struct.go @@ -5,9 +5,9 @@ package getPsFaultList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsIdByUserId/data.go b/iSolarCloud/WebAppService/getPsIdByUserId/data.go index 1152967d9..f0eb7093c 100644 --- a/iSolarCloud/WebAppService/getPsIdByUserId/data.go +++ b/iSolarCloud/WebAppService/getPsIdByUserId/data.go @@ -1,11 +1,12 @@ package getPsIdByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsIdByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsIdByUserId/struct.go b/iSolarCloud/WebAppService/getPsIdByUserId/struct.go index 39bcf0b15..54d31601a 100644 --- a/iSolarCloud/WebAppService/getPsIdByUserId/struct.go +++ b/iSolarCloud/WebAppService/getPsIdByUserId/struct.go @@ -5,9 +5,9 @@ package getPsIdByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsIdState/data.go b/iSolarCloud/WebAppService/getPsIdState/data.go index 7983fe253..46e6cd784 100644 --- a/iSolarCloud/WebAppService/getPsIdState/data.go +++ b/iSolarCloud/WebAppService/getPsIdState/data.go @@ -1,10 +1,11 @@ package getPsIdState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "WebAppService.getPsIdState" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { AllPsCount valueTypes.Integer `json:"allPsCount"` OffLinePsCount valueTypes.Integer `json:"offLinePsCount"` diff --git a/iSolarCloud/WebAppService/getPsIdState/struct.go b/iSolarCloud/WebAppService/getPsIdState/struct.go index 691ed05bf..0d9abba50 100644 --- a/iSolarCloud/WebAppService/getPsIdState/struct.go +++ b/iSolarCloud/WebAppService/getPsIdState/struct.go @@ -5,9 +5,9 @@ package getPsIdState import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsList/data.go b/iSolarCloud/WebAppService/getPsList/data.go index fc83e70d5..255a8a878 100644 --- a/iSolarCloud/WebAppService/getPsList/data.go +++ b/iSolarCloud/WebAppService/getPsList/data.go @@ -1,10 +1,11 @@ package getPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,8 +26,8 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"PsId"` - GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsId"` + GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"PsId"` + GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsId"` PsId valueTypes.Integer `json:"psid" PointId:"ps_id"` PsName valueTypes.String `json:"psname" PointId:"ps_name"` @@ -41,7 +42,7 @@ type ResultData []struct { PsType valueTypes.Integer `json:"ps_type"` ShareType valueTypes.String `json:"share_type"` - RowCount valueTypes.Integer `json:"rowCount"` + RowCount valueTypes.Integer `json:"rowCount"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/WebAppService/getPsList/struct.go b/iSolarCloud/WebAppService/getPsList/struct.go index 382e6cad0..f64a8d5d9 100644 --- a/iSolarCloud/WebAppService/getPsList/struct.go +++ b/iSolarCloud/WebAppService/getPsList/struct.go @@ -5,9 +5,9 @@ package getPsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go b/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go index 122498f0d..ddc7e2bfb 100644 --- a/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go +++ b/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go @@ -1,11 +1,12 @@ package getPsListForWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getPsListForWorkTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go b/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go index 169d5c0d0..d1d4c510e 100644 --- a/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go +++ b/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go @@ -5,9 +5,9 @@ package getPsListForWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsPictureMessage/data.go b/iSolarCloud/WebAppService/getPsPictureMessage/data.go index 15b881aba..fa140fe4a 100644 --- a/iSolarCloud/WebAppService/getPsPictureMessage/data.go +++ b/iSolarCloud/WebAppService/getPsPictureMessage/data.go @@ -1,11 +1,12 @@ package getPsPictureMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPsPictureMessage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsPictureMessage/struct.go b/iSolarCloud/WebAppService/getPsPictureMessage/struct.go index 3cf13482b..dce58912b 100644 --- a/iSolarCloud/WebAppService/getPsPictureMessage/struct.go +++ b/iSolarCloud/WebAppService/getPsPictureMessage/struct.go @@ -5,9 +5,9 @@ package getPsPictureMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go index cdf37add9..5539f901b 100644 --- a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go +++ b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go @@ -1,11 +1,12 @@ package getPsTicketSizeAndClockNum import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getPsTicketSizeAndClockNum" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go index 54edb7c3a..f38a8fa0c 100644 --- a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go +++ b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go @@ -5,9 +5,9 @@ package getPsTicketSizeAndClockNum import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsTree/data.go b/iSolarCloud/WebAppService/getPsTree/data.go index 6d1a1180a..894cf3a77 100644 --- a/iSolarCloud/WebAppService/getPsTree/data.go +++ b/iSolarCloud/WebAppService/getPsTree/data.go @@ -1,10 +1,11 @@ package getPsTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPsTree" @@ -13,7 +14,7 @@ const EndPointName = "WebAppService.getPsTree" type RequestData struct { // @TODO - Fixup this up for iSolarCloud/data_request.go - PsId3 valueTypes.PsId `json:"psid" required:"true"` + PsId3 valueTypes.PsId `json:"psid" required:"true"` } func (rd RequestData) IsValid() error { @@ -26,20 +27,20 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsId"` // PointIdFrom:"PsId" PointIdReplace:"true"` + GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsId"` // PointIdFrom:"PsId" PointIdReplace:"true"` PsId valueTypes.Integer `json:"psid" PointId:"ps_id"` Id valueTypes.Integer `json:"id"` ChannelId valueTypes.Integer `json:"chnnlid" PointId:"channel_id"` Pid valueTypes.Integer `json:"pid"` - Name valueTypes.String `json:"name"` - IsParent valueTypes.Bool `json:"isparent" PointId:"is_parent"` - Level valueTypes.Integer `json:"level"` - Unit valueTypes.String `json:"unit"` - AType interface{} `json:"atype" PointId:"a_type"` - CType interface{} `json:"ctype" PointId:"c_type"` - NodeKey valueTypes.Integer `json:"nodekey" PointId:"node_key"` + Name valueTypes.String `json:"name"` + IsParent valueTypes.Bool `json:"isparent" PointId:"is_parent"` + Level valueTypes.Integer `json:"level"` + Unit valueTypes.String `json:"unit"` + AType interface{} `json:"atype" PointId:"a_type"` + CType interface{} `json:"ctype" PointId:"c_type"` + NodeKey valueTypes.Integer `json:"nodekey" PointId:"node_key"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/WebAppService/getPsTree/struct.go b/iSolarCloud/WebAppService/getPsTree/struct.go index 3ca204f3e..fd519606b 100644 --- a/iSolarCloud/WebAppService/getPsTree/struct.go +++ b/iSolarCloud/WebAppService/getPsTree/struct.go @@ -5,9 +5,9 @@ package getPsTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsTreeChild/data.go b/iSolarCloud/WebAppService/getPsTreeChild/data.go index 8d9fae9a7..1e5d3d058 100644 --- a/iSolarCloud/WebAppService/getPsTreeChild/data.go +++ b/iSolarCloud/WebAppService/getPsTreeChild/data.go @@ -1,8 +1,8 @@ package getPsTreeChild import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsTreeChild/struct.go b/iSolarCloud/WebAppService/getPsTreeChild/struct.go index 6b086a410..eb1aee70f 100644 --- a/iSolarCloud/WebAppService/getPsTreeChild/struct.go +++ b/iSolarCloud/WebAppService/getPsTreeChild/struct.go @@ -5,9 +5,9 @@ package getPsTreeChild import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsUserList/data.go b/iSolarCloud/WebAppService/getPsUserList/data.go index e1aab3e5c..7c02f744f 100644 --- a/iSolarCloud/WebAppService/getPsUserList/data.go +++ b/iSolarCloud/WebAppService/getPsUserList/data.go @@ -1,8 +1,8 @@ package getPsUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) @@ -23,7 +23,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPsUserList/struct.go b/iSolarCloud/WebAppService/getPsUserList/struct.go index 145862e8c..66a4ada03 100644 --- a/iSolarCloud/WebAppService/getPsUserList/struct.go +++ b/iSolarCloud/WebAppService/getPsUserList/struct.go @@ -5,9 +5,9 @@ package getPsUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPsValue/data.go b/iSolarCloud/WebAppService/getPsValue/data.go index c6d7c236f..6fd6cb9ee 100644 --- a/iSolarCloud/WebAppService/getPsValue/data.go +++ b/iSolarCloud/WebAppService/getPsValue/data.go @@ -1,10 +1,11 @@ package getPsValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true"` + GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PsId" PointIdReplace:"true"` PsId valueTypes.PsId `json:"ps_id"` Id valueTypes.Integer `json:"id"` diff --git a/iSolarCloud/WebAppService/getPsValue/struct.go b/iSolarCloud/WebAppService/getPsValue/struct.go index c722f392d..7097e1083 100644 --- a/iSolarCloud/WebAppService/getPsValue/struct.go +++ b/iSolarCloud/WebAppService/getPsValue/struct.go @@ -5,9 +5,9 @@ package getPsValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getPscSeriseData/data.go b/iSolarCloud/WebAppService/getPscSeriseData/data.go index 6933685ef..ee7db49f2 100644 --- a/iSolarCloud/WebAppService/getPscSeriseData/data.go +++ b/iSolarCloud/WebAppService/getPscSeriseData/data.go @@ -1,11 +1,12 @@ package getPscSeriseData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPscSeriseData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getPscSeriseData/struct.go b/iSolarCloud/WebAppService/getPscSeriseData/struct.go index 638da6be4..3f3fc65f0 100644 --- a/iSolarCloud/WebAppService/getPscSeriseData/struct.go +++ b/iSolarCloud/WebAppService/getPscSeriseData/struct.go @@ -5,9 +5,9 @@ package getPscSeriseData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getReportInfoByReportId/data.go b/iSolarCloud/WebAppService/getReportInfoByReportId/data.go index 4760e3f4c..2f7bcc160 100644 --- a/iSolarCloud/WebAppService/getReportInfoByReportId/data.go +++ b/iSolarCloud/WebAppService/getReportInfoByReportId/data.go @@ -1,10 +1,11 @@ package getReportInfoByReportId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go b/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go index 309336f90..de7773e32 100644 --- a/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go +++ b/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go @@ -5,9 +5,9 @@ package getReportInfoByReportId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getReportListByType/data.go b/iSolarCloud/WebAppService/getReportListByType/data.go index bd0165fe2..3c09e8c39 100644 --- a/iSolarCloud/WebAppService/getReportListByType/data.go +++ b/iSolarCloud/WebAppService/getReportListByType/data.go @@ -1,10 +1,11 @@ package getReportListByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,9 +25,8 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"GoStruct" DataTable:"true" DataTableSortOn:"CreateTime"` + GoStructParent GoStruct.GoStructParent `json:"GoStruct" DataTable:"true" DataTableSortOn:"CreateTime"` CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` Cycle valueTypes.Integer `json:"cycle"` diff --git a/iSolarCloud/WebAppService/getReportListByType/struct.go b/iSolarCloud/WebAppService/getReportListByType/struct.go index 10c6763d4..a9edd6c4a 100644 --- a/iSolarCloud/WebAppService/getReportListByType/struct.go +++ b/iSolarCloud/WebAppService/getReportListByType/struct.go @@ -5,9 +5,9 @@ package getReportListByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getReportPsTree/data.go b/iSolarCloud/WebAppService/getReportPsTree/data.go index 5b1499620..dfe55e8a7 100644 --- a/iSolarCloud/WebAppService/getReportPsTree/data.go +++ b/iSolarCloud/WebAppService/getReportPsTree/data.go @@ -1,10 +1,11 @@ package getReportPsTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -14,7 +15,7 @@ const EndPointName = "WebAppService.getReportPsTree" type RequestData struct { DeviceType valueTypes.Integer `json:"device_type" required:"true"` - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsKey"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsKey"` PsId valueTypes.Integer `json:"ps_id"` PsKey valueTypes.String `json:"ps_key"` diff --git a/iSolarCloud/WebAppService/getReportPsTree/struct.go b/iSolarCloud/WebAppService/getReportPsTree/struct.go index d5e7fb46d..18e7f2a8d 100644 --- a/iSolarCloud/WebAppService/getReportPsTree/struct.go +++ b/iSolarCloud/WebAppService/getReportPsTree/struct.go @@ -5,9 +5,9 @@ package getReportPsTree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getRoleList/data.go b/iSolarCloud/WebAppService/getRoleList/data.go index 4b52e3379..3d5ddbd2c 100644 --- a/iSolarCloud/WebAppService/getRoleList/data.go +++ b/iSolarCloud/WebAppService/getRoleList/data.go @@ -1,11 +1,12 @@ package getRoleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getRoleList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getRoleList/struct.go b/iSolarCloud/WebAppService/getRoleList/struct.go index 70f3f2bfa..0930003b4 100644 --- a/iSolarCloud/WebAppService/getRoleList/struct.go +++ b/iSolarCloud/WebAppService/getRoleList/struct.go @@ -5,9 +5,9 @@ package getRoleList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSafeEffectList/data.go b/iSolarCloud/WebAppService/getSafeEffectList/data.go index 73c20e389..f3bbf9b3e 100644 --- a/iSolarCloud/WebAppService/getSafeEffectList/data.go +++ b/iSolarCloud/WebAppService/getSafeEffectList/data.go @@ -1,11 +1,12 @@ package getSafeEffectList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getSafeEffectList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getSafeEffectList/struct.go b/iSolarCloud/WebAppService/getSafeEffectList/struct.go index 45b8a1a40..489ef835c 100644 --- a/iSolarCloud/WebAppService/getSafeEffectList/struct.go +++ b/iSolarCloud/WebAppService/getSafeEffectList/struct.go @@ -5,9 +5,9 @@ package getSafeEffectList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go b/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go index 1c8e45eaf..306e180e1 100644 --- a/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go +++ b/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go @@ -1,11 +1,12 @@ package getSecondTypeTicketList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getSecondTypeTicketList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go b/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go index 6683c3ae0..f59bec411 100644 --- a/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go +++ b/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go @@ -5,9 +5,9 @@ package getSecondTypeTicketList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go index 61c982cd9..6b1c2b9e4 100644 --- a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go +++ b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go @@ -1,11 +1,12 @@ package getSecondTypeTicketListForTicketDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getSecondTypeTicketListForTicketDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go index bbee6ee5e..07f6b318d 100644 --- a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go +++ b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go @@ -5,9 +5,9 @@ package getSecondTypeTicketListForTicketDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSelfReportPoint/data.go b/iSolarCloud/WebAppService/getSelfReportPoint/data.go index 68ccc3d9d..b931b1377 100644 --- a/iSolarCloud/WebAppService/getSelfReportPoint/data.go +++ b/iSolarCloud/WebAppService/getSelfReportPoint/data.go @@ -1,9 +1,9 @@ package getSelfReportPoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -27,11 +27,11 @@ func (rd RequestData) Help() string { type ResultData []struct { GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PointId"` - PointId valueTypes.PointId `json:"point_id" PointDevice:""` - PointName valueTypes.String `json:"point_name"` - Id valueTypes.Integer `json:"id"` - DeviceType valueTypes.Integer `json:"device_type"` - Period valueTypes.Integer `json:"period"` + PointId valueTypes.PointId `json:"point_id" PointDevice:""` + PointName valueTypes.String `json:"point_name"` + Id valueTypes.Integer `json:"id"` + DeviceType valueTypes.Integer `json:"device_type"` + Period valueTypes.Integer `json:"period"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/WebAppService/getSelfReportPoint/struct.go b/iSolarCloud/WebAppService/getSelfReportPoint/struct.go index c97715cca..453322b3e 100644 --- a/iSolarCloud/WebAppService/getSelfReportPoint/struct.go +++ b/iSolarCloud/WebAppService/getSelfReportPoint/struct.go @@ -5,9 +5,9 @@ package getSelfReportPoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSparePartsDetail/data.go b/iSolarCloud/WebAppService/getSparePartsDetail/data.go index 75374721f..0df32640c 100644 --- a/iSolarCloud/WebAppService/getSparePartsDetail/data.go +++ b/iSolarCloud/WebAppService/getSparePartsDetail/data.go @@ -1,11 +1,12 @@ package getSparePartsDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getSparePartsDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getSparePartsDetail/struct.go b/iSolarCloud/WebAppService/getSparePartsDetail/struct.go index eb11e6113..764bb43a9 100644 --- a/iSolarCloud/WebAppService/getSparePartsDetail/struct.go +++ b/iSolarCloud/WebAppService/getSparePartsDetail/struct.go @@ -5,9 +5,9 @@ package getSparePartsDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getStatementList/data.go b/iSolarCloud/WebAppService/getStatementList/data.go index 51d5af3d5..03134328e 100644 --- a/iSolarCloud/WebAppService/getStatementList/data.go +++ b/iSolarCloud/WebAppService/getStatementList/data.go @@ -1,11 +1,12 @@ package getStatementList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getStatementList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getStatementList/struct.go b/iSolarCloud/WebAppService/getStatementList/struct.go index caf5e5bed..dbb533a88 100644 --- a/iSolarCloud/WebAppService/getStatementList/struct.go +++ b/iSolarCloud/WebAppService/getStatementList/struct.go @@ -5,9 +5,9 @@ package getStatementList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getStoreByStationId/data.go b/iSolarCloud/WebAppService/getStoreByStationId/data.go index d260f4cc0..a0c3342ef 100644 --- a/iSolarCloud/WebAppService/getStoreByStationId/data.go +++ b/iSolarCloud/WebAppService/getStoreByStationId/data.go @@ -1,11 +1,12 @@ package getStoreByStationId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/getStoreByStationId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getStoreByStationId/struct.go b/iSolarCloud/WebAppService/getStoreByStationId/struct.go index ffff77ced..6be3cbd3a 100644 --- a/iSolarCloud/WebAppService/getStoreByStationId/struct.go +++ b/iSolarCloud/WebAppService/getStoreByStationId/struct.go @@ -5,9 +5,9 @@ package getStoreByStationId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getSysUserList/data.go b/iSolarCloud/WebAppService/getSysUserList/data.go index c1184bdfd..3252a525c 100644 --- a/iSolarCloud/WebAppService/getSysUserList/data.go +++ b/iSolarCloud/WebAppService/getSysUserList/data.go @@ -1,11 +1,12 @@ package getSysUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getSysUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getSysUserList/struct.go b/iSolarCloud/WebAppService/getSysUserList/struct.go index 112db1d5e..2135e8ff4 100644 --- a/iSolarCloud/WebAppService/getSysUserList/struct.go +++ b/iSolarCloud/WebAppService/getSysUserList/struct.go @@ -5,9 +5,9 @@ package getSysUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getTableList/data.go b/iSolarCloud/WebAppService/getTableList/data.go index 7c584cb85..a88c481bd 100644 --- a/iSolarCloud/WebAppService/getTableList/data.go +++ b/iSolarCloud/WebAppService/getTableList/data.go @@ -1,10 +1,11 @@ package getTableList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getTableList/struct.go b/iSolarCloud/WebAppService/getTableList/struct.go index 957c7524b..a085e211b 100644 --- a/iSolarCloud/WebAppService/getTableList/struct.go +++ b/iSolarCloud/WebAppService/getTableList/struct.go @@ -5,9 +5,9 @@ package getTableList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getUserList/data.go b/iSolarCloud/WebAppService/getUserList/data.go index 5b7a69807..71e4367c8 100644 --- a/iSolarCloud/WebAppService/getUserList/data.go +++ b/iSolarCloud/WebAppService/getUserList/data.go @@ -1,11 +1,12 @@ package getUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getUserList/struct.go b/iSolarCloud/WebAppService/getUserList/struct.go index 6aa4170e7..3bac5e65e 100644 --- a/iSolarCloud/WebAppService/getUserList/struct.go +++ b/iSolarCloud/WebAppService/getUserList/struct.go @@ -5,9 +5,9 @@ package getUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getWeather/data.go b/iSolarCloud/WebAppService/getWeather/data.go index ff0c1db2e..13b4b3847 100644 --- a/iSolarCloud/WebAppService/getWeather/data.go +++ b/iSolarCloud/WebAppService/getWeather/data.go @@ -1,11 +1,12 @@ package getWeather import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getWeather" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getWeather/struct.go b/iSolarCloud/WebAppService/getWeather/struct.go index 3908e55ff..eb9d0709b 100644 --- a/iSolarCloud/WebAppService/getWeather/struct.go +++ b/iSolarCloud/WebAppService/getWeather/struct.go @@ -5,9 +5,9 @@ package getWeather import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getWorkTicketList/data.go b/iSolarCloud/WebAppService/getWorkTicketList/data.go index 1109bd9f5..53e484ccb 100644 --- a/iSolarCloud/WebAppService/getWorkTicketList/data.go +++ b/iSolarCloud/WebAppService/getWorkTicketList/data.go @@ -1,11 +1,12 @@ package getWorkTicketList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getWorkTicketList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getWorkTicketList/struct.go b/iSolarCloud/WebAppService/getWorkTicketList/struct.go index c4dabbc3d..7e1b6a709 100644 --- a/iSolarCloud/WebAppService/getWorkTicketList/struct.go +++ b/iSolarCloud/WebAppService/getWorkTicketList/struct.go @@ -5,9 +5,9 @@ package getWorkTicketList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go index 02a6f0cbc..236f20bf1 100644 --- a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go +++ b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go @@ -1,11 +1,12 @@ package getWorkTicketListForTicketDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getWorkTicketListForTicketDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go index 8eb6c2187..935a6cda0 100644 --- a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go +++ b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go @@ -5,9 +5,9 @@ package getWorkTicketListForTicketDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go b/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go index dc0be5272..5fbbc4b86 100644 --- a/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go +++ b/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go @@ -1,11 +1,12 @@ package getWorkTicketRunningCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getWorkTicketRunningCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go b/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go index 631dcf945..625afa74d 100644 --- a/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go +++ b/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go @@ -5,9 +5,9 @@ package getWorkTicketRunningCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getWorkTicketUserList/data.go b/iSolarCloud/WebAppService/getWorkTicketUserList/data.go index cb1a83a43..798c1ae44 100644 --- a/iSolarCloud/WebAppService/getWorkTicketUserList/data.go +++ b/iSolarCloud/WebAppService/getWorkTicketUserList/data.go @@ -1,11 +1,12 @@ package getWorkTicketUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getWorkTicketUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go b/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go index 83eeb0371..8769b09a9 100644 --- a/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go +++ b/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go @@ -5,9 +5,9 @@ package getWorkTicketUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getinverterType/data.go b/iSolarCloud/WebAppService/getinverterType/data.go index 069cf9296..ad1901d87 100644 --- a/iSolarCloud/WebAppService/getinverterType/data.go +++ b/iSolarCloud/WebAppService/getinverterType/data.go @@ -1,11 +1,12 @@ package getinverterType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getinverterType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getinverterType/struct.go b/iSolarCloud/WebAppService/getinverterType/struct.go index 2d83ec5e4..7c365f2e0 100644 --- a/iSolarCloud/WebAppService/getinverterType/struct.go +++ b/iSolarCloud/WebAppService/getinverterType/struct.go @@ -5,9 +5,9 @@ package getinverterType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/getreportPermissionByUser/data.go b/iSolarCloud/WebAppService/getreportPermissionByUser/data.go index 326ebfec2..b2fcaa9c3 100644 --- a/iSolarCloud/WebAppService/getreportPermissionByUser/data.go +++ b/iSolarCloud/WebAppService/getreportPermissionByUser/data.go @@ -1,11 +1,12 @@ package getreportPermissionByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/getPsIdByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go b/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go index 3a3f30bfa..8058cf6a1 100644 --- a/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go +++ b/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go @@ -5,9 +5,9 @@ package getreportPermissionByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/handleValue/data.go b/iSolarCloud/WebAppService/handleValue/data.go index f65e1e28c..fdd9db120 100644 --- a/iSolarCloud/WebAppService/handleValue/data.go +++ b/iSolarCloud/WebAppService/handleValue/data.go @@ -1,11 +1,12 @@ package handleValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/handleValue" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/handleValue/struct.go b/iSolarCloud/WebAppService/handleValue/struct.go index b2be7575b..57c675e4c 100644 --- a/iSolarCloud/WebAppService/handleValue/struct.go +++ b/iSolarCloud/WebAppService/handleValue/struct.go @@ -5,9 +5,9 @@ package handleValue import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/modifyDeviceInfo/data.go b/iSolarCloud/WebAppService/modifyDeviceInfo/data.go index e8d8b371e..7d8269e58 100644 --- a/iSolarCloud/WebAppService/modifyDeviceInfo/data.go +++ b/iSolarCloud/WebAppService/modifyDeviceInfo/data.go @@ -1,11 +1,12 @@ package modifyDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/modifyDeviceInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go b/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go index 8026ed56f..a19575442 100644 --- a/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go +++ b/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go @@ -5,9 +5,9 @@ package modifyDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/operaStoreSpareParts/data.go b/iSolarCloud/WebAppService/operaStoreSpareParts/data.go index 4bb72b31b..f4e7f79c8 100644 --- a/iSolarCloud/WebAppService/operaStoreSpareParts/data.go +++ b/iSolarCloud/WebAppService/operaStoreSpareParts/data.go @@ -1,11 +1,12 @@ package operaStoreSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/operaStoreSpareParts" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go b/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go index d17cc67ad..04c4368c5 100644 --- a/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go +++ b/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go @@ -5,9 +5,9 @@ package operaStoreSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/operateBillTransferToUser/data.go b/iSolarCloud/WebAppService/operateBillTransferToUser/data.go index 1ec878abe..3aa4121ed 100644 --- a/iSolarCloud/WebAppService/operateBillTransferToUser/data.go +++ b/iSolarCloud/WebAppService/operateBillTransferToUser/data.go @@ -1,11 +1,12 @@ package operateBillTransferToUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/operateBillTransferToUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go b/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go index 4f764e3e4..969b7fba7 100644 --- a/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go +++ b/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go @@ -5,9 +5,9 @@ package operateBillTransferToUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryAllStockInventory/data.go b/iSolarCloud/WebAppService/queryAllStockInventory/data.go index e3add5428..5fb4f8341 100644 --- a/iSolarCloud/WebAppService/queryAllStockInventory/data.go +++ b/iSolarCloud/WebAppService/queryAllStockInventory/data.go @@ -1,11 +1,12 @@ package queryAllStockInventory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/queryAllStockInventory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryAllStockInventory/struct.go b/iSolarCloud/WebAppService/queryAllStockInventory/struct.go index c5c87d14f..234457393 100644 --- a/iSolarCloud/WebAppService/queryAllStockInventory/struct.go +++ b/iSolarCloud/WebAppService/queryAllStockInventory/struct.go @@ -5,9 +5,9 @@ package queryAllStockInventory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go b/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go index 5aa40d4d6..3b0f51a14 100644 --- a/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go +++ b/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go @@ -1,11 +1,12 @@ package queryBatteryBoardsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -14,9 +15,9 @@ const Disabled = false const EndPointName = "WebAppService.queryBatteryBoardsList" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` DeviceType valueTypes.Integer `json:"device_type" required:"true"` - DeviceSn valueTypes.String `json:"device_sn,omitempty"` + DeviceSn valueTypes.String `json:"device_sn,omitempty"` Uuid valueTypes.Integer `json:"uuid,omitempty"` } @@ -29,7 +30,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go b/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go index 1a009e841..eea86e46d 100644 --- a/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go +++ b/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go @@ -5,9 +5,9 @@ package queryBatteryBoardsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go index db28a785a..75c2d3d69 100644 --- a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go +++ b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go @@ -1,11 +1,12 @@ package queryBatteryBoardsPointsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryBatteryBoardsPointsData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go index ce6f0bfd6..4ec57a3b0 100644 --- a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go +++ b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go @@ -5,9 +5,9 @@ package queryBatteryBoardsPointsData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryCodeByType/data.go b/iSolarCloud/WebAppService/queryCodeByType/data.go index de24a0b92..b0065dbb5 100644 --- a/iSolarCloud/WebAppService/queryCodeByType/data.go +++ b/iSolarCloud/WebAppService/queryCodeByType/data.go @@ -1,11 +1,12 @@ package queryCodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/queryCodeByType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryCodeByType/struct.go b/iSolarCloud/WebAppService/queryCodeByType/struct.go index 3bc7ff331..58874a5e7 100644 --- a/iSolarCloud/WebAppService/queryCodeByType/struct.go +++ b/iSolarCloud/WebAppService/queryCodeByType/struct.go @@ -5,9 +5,9 @@ package queryCodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryDeviceInfoList/data.go b/iSolarCloud/WebAppService/queryDeviceInfoList/data.go index b153bb5a3..46a9bac42 100644 --- a/iSolarCloud/WebAppService/queryDeviceInfoList/data.go +++ b/iSolarCloud/WebAppService/queryDeviceInfoList/data.go @@ -1,11 +1,12 @@ package queryDeviceInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/queryDeviceInfoList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go b/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go index 9b5d2c3ce..718870b3d 100644 --- a/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go +++ b/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go @@ -5,9 +5,9 @@ package queryDeviceInfoList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go b/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go index 5c75fb642..11b25650a 100644 --- a/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go +++ b/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go @@ -1,11 +1,12 @@ package queryElectricityCalendarData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/queryElectricityCalendarData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go b/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go index 54ce9bde9..0d21262d7 100644 --- a/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go +++ b/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go @@ -5,9 +5,9 @@ package queryElectricityCalendarData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryFaultCodes/data.go b/iSolarCloud/WebAppService/queryFaultCodes/data.go index b85163378..fc5cd4c1c 100644 --- a/iSolarCloud/WebAppService/queryFaultCodes/data.go +++ b/iSolarCloud/WebAppService/queryFaultCodes/data.go @@ -1,11 +1,12 @@ package queryFaultCodes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryFaultCodes/struct.go b/iSolarCloud/WebAppService/queryFaultCodes/struct.go index b9b8f8d29..ed5d1b224 100644 --- a/iSolarCloud/WebAppService/queryFaultCodes/struct.go +++ b/iSolarCloud/WebAppService/queryFaultCodes/struct.go @@ -5,9 +5,9 @@ package queryFaultCodes import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go b/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go index 06340104d..2ee8674e1 100644 --- a/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go +++ b/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go @@ -1,11 +1,12 @@ package queryFaultLevelAndType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultLevelAndType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go b/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go index f14e3e7be..dd44c8048 100644 --- a/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go +++ b/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go @@ -5,9 +5,9 @@ package queryFaultLevelAndType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryFaultNames/data.go b/iSolarCloud/WebAppService/queryFaultNames/data.go index 3a09d7eee..a1bef9264 100644 --- a/iSolarCloud/WebAppService/queryFaultNames/data.go +++ b/iSolarCloud/WebAppService/queryFaultNames/data.go @@ -1,11 +1,12 @@ package queryFaultNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryFaultNames" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryFaultNames/struct.go b/iSolarCloud/WebAppService/queryFaultNames/struct.go index 0c44e7996..6e0bf1c98 100644 --- a/iSolarCloud/WebAppService/queryFaultNames/struct.go +++ b/iSolarCloud/WebAppService/queryFaultNames/struct.go @@ -5,9 +5,9 @@ package queryFaultNames import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryMaterialType/data.go b/iSolarCloud/WebAppService/queryMaterialType/data.go index 17a05f5f3..d7f375ae8 100644 --- a/iSolarCloud/WebAppService/queryMaterialType/data.go +++ b/iSolarCloud/WebAppService/queryMaterialType/data.go @@ -1,11 +1,12 @@ package queryMaterialType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/queryMaterialType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryMaterialType/struct.go b/iSolarCloud/WebAppService/queryMaterialType/struct.go index a89a12e3d..ea820b29c 100644 --- a/iSolarCloud/WebAppService/queryMaterialType/struct.go +++ b/iSolarCloud/WebAppService/queryMaterialType/struct.go @@ -5,9 +5,9 @@ package queryMaterialType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryNounAndKlgList/data.go b/iSolarCloud/WebAppService/queryNounAndKlgList/data.go index d268885b5..2d0b866ab 100644 --- a/iSolarCloud/WebAppService/queryNounAndKlgList/data.go +++ b/iSolarCloud/WebAppService/queryNounAndKlgList/data.go @@ -1,11 +1,12 @@ package queryNounAndKlgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryNounAndKlgList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go b/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go index 898e67b97..3937eda33 100644 --- a/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go +++ b/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go @@ -5,9 +5,9 @@ package queryNounAndKlgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryNounList/data.go b/iSolarCloud/WebAppService/queryNounList/data.go index d22c35f39..c0ec0004e 100644 --- a/iSolarCloud/WebAppService/queryNounList/data.go +++ b/iSolarCloud/WebAppService/queryNounList/data.go @@ -1,10 +1,11 @@ package queryNounList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { NounInfo []interface{} `json:"nounInfo"` } diff --git a/iSolarCloud/WebAppService/queryNounList/struct.go b/iSolarCloud/WebAppService/queryNounList/struct.go index 1ba419543..145abf922 100644 --- a/iSolarCloud/WebAppService/queryNounList/struct.go +++ b/iSolarCloud/WebAppService/queryNounList/struct.go @@ -5,9 +5,9 @@ package queryNounList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryOptTickctInfo/data.go b/iSolarCloud/WebAppService/queryOptTickctInfo/data.go index a75eeb660..b458c6f24 100644 --- a/iSolarCloud/WebAppService/queryOptTickctInfo/data.go +++ b/iSolarCloud/WebAppService/queryOptTickctInfo/data.go @@ -1,11 +1,12 @@ package queryOptTickctInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/queryOptTickctInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go b/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go index 31742b908..deb86b484 100644 --- a/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go +++ b/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go @@ -5,9 +5,9 @@ package queryOptTickctInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryOrgIdByUser/data.go b/iSolarCloud/WebAppService/queryOrgIdByUser/data.go index 1d693f954..207f9e8e7 100644 --- a/iSolarCloud/WebAppService/queryOrgIdByUser/data.go +++ b/iSolarCloud/WebAppService/queryOrgIdByUser/data.go @@ -1,11 +1,12 @@ package queryOrgIdByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/queryOrgIdByUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go b/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go index 56927aff3..f886a1317 100644 --- a/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go +++ b/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go @@ -5,9 +5,9 @@ package queryOrgIdByUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryPsCountryList/data.go b/iSolarCloud/WebAppService/queryPsCountryList/data.go index 309b10304..e5e57905f 100644 --- a/iSolarCloud/WebAppService/queryPsCountryList/data.go +++ b/iSolarCloud/WebAppService/queryPsCountryList/data.go @@ -1,11 +1,12 @@ package queryPsCountryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/queryPsCountryList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryPsCountryList/struct.go b/iSolarCloud/WebAppService/queryPsCountryList/struct.go index eeb2e713e..d3298b91c 100644 --- a/iSolarCloud/WebAppService/queryPsCountryList/struct.go +++ b/iSolarCloud/WebAppService/queryPsCountryList/struct.go @@ -5,9 +5,9 @@ package queryPsCountryList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryPsProvcnList/data.go b/iSolarCloud/WebAppService/queryPsProvcnList/data.go index 76b13d970..8812dc83e 100644 --- a/iSolarCloud/WebAppService/queryPsProvcnList/data.go +++ b/iSolarCloud/WebAppService/queryPsProvcnList/data.go @@ -1,11 +1,12 @@ package queryPsProvcnList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/queryPsProvcnList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryPsProvcnList/struct.go b/iSolarCloud/WebAppService/queryPsProvcnList/struct.go index d7ca2fef9..da67a3cc4 100644 --- a/iSolarCloud/WebAppService/queryPsProvcnList/struct.go +++ b/iSolarCloud/WebAppService/queryPsProvcnList/struct.go @@ -5,9 +5,9 @@ package queryPsProvcnList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go b/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go index e7b8a02f0..2b3198f42 100644 --- a/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go +++ b/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go @@ -1,11 +1,12 @@ package queryPsTypeByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/queryPsTypeByPsId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go b/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go index c2186cecc..75fbf42c9 100644 --- a/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go +++ b/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go @@ -5,9 +5,9 @@ package queryPsTypeByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/querySparePartsList/data.go b/iSolarCloud/WebAppService/querySparePartsList/data.go index 388879152..84711e175 100644 --- a/iSolarCloud/WebAppService/querySparePartsList/data.go +++ b/iSolarCloud/WebAppService/querySparePartsList/data.go @@ -1,11 +1,12 @@ package querySparePartsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/querySparePartsList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/querySparePartsList/struct.go b/iSolarCloud/WebAppService/querySparePartsList/struct.go index 930f26499..259fec470 100644 --- a/iSolarCloud/WebAppService/querySparePartsList/struct.go +++ b/iSolarCloud/WebAppService/querySparePartsList/struct.go @@ -5,9 +5,9 @@ package querySparePartsList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryStoreList/data.go b/iSolarCloud/WebAppService/queryStoreList/data.go index d3d23ed95..f2a5ec7a9 100644 --- a/iSolarCloud/WebAppService/queryStoreList/data.go +++ b/iSolarCloud/WebAppService/queryStoreList/data.go @@ -1,11 +1,12 @@ package queryStoreList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/queryStoreList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryStoreList/struct.go b/iSolarCloud/WebAppService/queryStoreList/struct.go index 5a71dd24c..477d647d9 100644 --- a/iSolarCloud/WebAppService/queryStoreList/struct.go +++ b/iSolarCloud/WebAppService/queryStoreList/struct.go @@ -5,9 +5,9 @@ package queryStoreList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/querySysTimezone/data.go b/iSolarCloud/WebAppService/querySysTimezone/data.go index 71a500b62..08ec365dc 100644 --- a/iSolarCloud/WebAppService/querySysTimezone/data.go +++ b/iSolarCloud/WebAppService/querySysTimezone/data.go @@ -1,11 +1,12 @@ package querySysTimezone import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/querySysTimezone" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/querySysTimezone/struct.go b/iSolarCloud/WebAppService/querySysTimezone/struct.go index fb23d85f9..016c26d79 100644 --- a/iSolarCloud/WebAppService/querySysTimezone/struct.go +++ b/iSolarCloud/WebAppService/querySysTimezone/struct.go @@ -5,9 +5,9 @@ package querySysTimezone import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go b/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go index 7263448f7..c6998ac10 100644 --- a/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go +++ b/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go @@ -1,11 +1,12 @@ package queryUnInventorySpareList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/queryUnInventorySpareList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go b/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go index 8ea1d9550..d275cd7d1 100644 --- a/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go +++ b/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go @@ -5,9 +5,9 @@ package queryUnInventorySpareList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go index df355382c..4ddee662a 100644 --- a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go +++ b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go @@ -1,10 +1,11 @@ package queryUserCurveTemplateData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" "fmt" @@ -14,7 +15,6 @@ const Url = "/v1/devService/queryUserCurveTemplateData" const Disabled = false const EndPointName = "WebAppService.queryUserCurveTemplateData" - // {"template_id":"","date_type":"","start_time":"","end_time":""} type RequestData struct { @@ -34,7 +34,6 @@ func (rd RequestData) Help() string { return ret } - // ResultData (struct) -> PointsData(struct) -> Devices(map[string]DeviceData) -> Points(map[string]Point) type ResultData struct { CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"DateTimeLayout"` @@ -49,10 +48,9 @@ type ResultData struct { PointsData PointsData `json:"points_data" PointIdReplace:"true"` } - type PointsData struct { - Devices map[string]DeviceData `json:"devices" PointIdReplace:"true"` // PointIdFromChild:"DateId" PointIdReplace:"true"` - Order valueTypes.String `json:"order" PointSplitOn:"," PointValueReplace:"&" PointValueReplaceWith:".p"` + Devices map[string]DeviceData `json:"devices" PointIdReplace:"true"` // PointIdFromChild:"DateId" PointIdReplace:"true"` + Order valueTypes.String `json:"order" PointSplitOn:"," PointValueReplace:"&" PointValueReplaceWith:".p"` } type Devices map[string]DeviceData @@ -96,12 +94,11 @@ func (p *PointsData) UnmarshalJSON(data []byte) error { return err } - 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" DataTable:"true" DataTableMerge:"true" DataTableSortOn:"PointId"` // PointIdReplace:"false" PointIdFromChild:"PsId.PsKey" + Points Points `json:"points" DataTable:"true" DataTableMerge:"true" DataTableSortOn:"PointId"` // PointIdReplace:"false" PointIdFromChild:"PsId.PsKey" } func (p *DeviceData) UnmarshalJSON(data []byte) error { @@ -144,7 +141,6 @@ func (p *DeviceData) UnmarshalJSON(data []byte) error { return err } - type Points map[string]Point func (p *Points) UnmarshalJSON(data []byte) error { @@ -171,7 +167,6 @@ func (p *Points) UnmarshalJSON(data []byte) error { return err } - type Point struct { PointId valueTypes.PointId `json:"point_id"` PointName valueTypes.String `json:"point_name"` diff --git a/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go b/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go index 9321f8940..3f3f9d277 100644 --- a/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go +++ b/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go @@ -5,9 +5,9 @@ package queryUserCurveTemplateData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/renewOperation/data.go b/iSolarCloud/WebAppService/renewOperation/data.go index a492c65de..ea8a8463b 100644 --- a/iSolarCloud/WebAppService/renewOperation/data.go +++ b/iSolarCloud/WebAppService/renewOperation/data.go @@ -1,11 +1,12 @@ package renewOperation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/renewOperation" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/renewOperation/struct.go b/iSolarCloud/WebAppService/renewOperation/struct.go index 5d45c076b..24de10df4 100644 --- a/iSolarCloud/WebAppService/renewOperation/struct.go +++ b/iSolarCloud/WebAppService/renewOperation/struct.go @@ -5,9 +5,9 @@ package renewOperation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveCustomReport/data.go b/iSolarCloud/WebAppService/saveCustomReport/data.go index 0538e17a2..d7b2b99c3 100644 --- a/iSolarCloud/WebAppService/saveCustomReport/data.go +++ b/iSolarCloud/WebAppService/saveCustomReport/data.go @@ -1,11 +1,12 @@ package saveCustomReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/saveCustomReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveCustomReport/struct.go b/iSolarCloud/WebAppService/saveCustomReport/struct.go index 8b662ede0..7d3b097c7 100644 --- a/iSolarCloud/WebAppService/saveCustomReport/struct.go +++ b/iSolarCloud/WebAppService/saveCustomReport/struct.go @@ -5,9 +5,9 @@ package saveCustomReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveDutyInfo/data.go b/iSolarCloud/WebAppService/saveDutyInfo/data.go index 4face4df9..d87e71954 100644 --- a/iSolarCloud/WebAppService/saveDutyInfo/data.go +++ b/iSolarCloud/WebAppService/saveDutyInfo/data.go @@ -1,11 +1,12 @@ package saveDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/saveDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveDutyInfo/struct.go b/iSolarCloud/WebAppService/saveDutyInfo/struct.go index fdf771b92..2f0631638 100644 --- a/iSolarCloud/WebAppService/saveDutyInfo/struct.go +++ b/iSolarCloud/WebAppService/saveDutyInfo/struct.go @@ -5,9 +5,9 @@ package saveDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveInventory/data.go b/iSolarCloud/WebAppService/saveInventory/data.go index fb58b1fb4..ea04567b1 100644 --- a/iSolarCloud/WebAppService/saveInventory/data.go +++ b/iSolarCloud/WebAppService/saveInventory/data.go @@ -1,11 +1,12 @@ package saveInventory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/saveInventory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveInventory/struct.go b/iSolarCloud/WebAppService/saveInventory/struct.go index 772579aad..83d48991d 100644 --- a/iSolarCloud/WebAppService/saveInventory/struct.go +++ b/iSolarCloud/WebAppService/saveInventory/struct.go @@ -5,9 +5,9 @@ package saveInventory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveMaterial/data.go b/iSolarCloud/WebAppService/saveMaterial/data.go index 80e5c3f66..6d0e2b6d0 100644 --- a/iSolarCloud/WebAppService/saveMaterial/data.go +++ b/iSolarCloud/WebAppService/saveMaterial/data.go @@ -1,11 +1,12 @@ package saveMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveMaterial" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveMaterial/struct.go b/iSolarCloud/WebAppService/saveMaterial/struct.go index fa35b8e43..03cf66759 100644 --- a/iSolarCloud/WebAppService/saveMaterial/struct.go +++ b/iSolarCloud/WebAppService/saveMaterial/struct.go @@ -5,9 +5,9 @@ package saveMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go b/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go index a49034d43..df49d9f52 100644 --- a/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go +++ b/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go @@ -1,11 +1,12 @@ package saveSecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/saveSecondTypeTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go b/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go index 5c90ea07f..7f3b73995 100644 --- a/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go +++ b/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go @@ -5,9 +5,9 @@ package saveSecondTypeTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveSelfReportPoint/data.go b/iSolarCloud/WebAppService/saveSelfReportPoint/data.go index d876f7ecb..123adf66d 100644 --- a/iSolarCloud/WebAppService/saveSelfReportPoint/data.go +++ b/iSolarCloud/WebAppService/saveSelfReportPoint/data.go @@ -1,11 +1,12 @@ package saveSelfReportPoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/saveSelfReportPoint" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go b/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go index bae9146ec..a346365b7 100644 --- a/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go +++ b/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go @@ -5,9 +5,9 @@ package saveSelfReportPoint import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/saveWorkTicket/data.go b/iSolarCloud/WebAppService/saveWorkTicket/data.go index fab8517d3..a388b7ef1 100644 --- a/iSolarCloud/WebAppService/saveWorkTicket/data.go +++ b/iSolarCloud/WebAppService/saveWorkTicket/data.go @@ -1,11 +1,12 @@ package saveWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/saveWorkTicket" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/saveWorkTicket/struct.go b/iSolarCloud/WebAppService/saveWorkTicket/struct.go index d0a1f056d..8b85736a8 100644 --- a/iSolarCloud/WebAppService/saveWorkTicket/struct.go +++ b/iSolarCloud/WebAppService/saveWorkTicket/struct.go @@ -5,9 +5,9 @@ package saveWorkTicket import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go index be4da9622..08b254c26 100644 --- a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go +++ b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go @@ -1,11 +1,12 @@ package secondTypeTicketFlowImplementStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/secondTypeTicketFlowImplementStep" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go index a17b123b3..d290a073f 100644 --- a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go +++ b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go @@ -5,9 +5,9 @@ package secondTypeTicketFlowImplementStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go index 70ff78131..d56e3aa84 100644 --- a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go +++ b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go @@ -1,11 +1,12 @@ package secondTypeTicketFlowTransferStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/secondTypeTicketFlowTransferStep" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go index 053d31bcb..000c31058 100644 --- a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go +++ b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go @@ -5,9 +5,9 @@ package secondTypeTicketFlowTransferStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go b/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go index d74c324d7..7bf0ae040 100644 --- a/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go +++ b/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go @@ -1,11 +1,12 @@ package secondTypeUpdateSign import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/secondTypeUpdateSign" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go b/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go index 5e651ff44..7fc466d03 100644 --- a/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go +++ b/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go @@ -5,9 +5,9 @@ package secondTypeUpdateSign import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/selectPowerPageList/data.go b/iSolarCloud/WebAppService/selectPowerPageList/data.go index 76526acae..621b5e8b7 100644 --- a/iSolarCloud/WebAppService/selectPowerPageList/data.go +++ b/iSolarCloud/WebAppService/selectPowerPageList/data.go @@ -1,11 +1,12 @@ package selectPowerPageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/selectPowerPageList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/selectPowerPageList/struct.go b/iSolarCloud/WebAppService/selectPowerPageList/struct.go index 2086f4e12..49fb9e094 100644 --- a/iSolarCloud/WebAppService/selectPowerPageList/struct.go +++ b/iSolarCloud/WebAppService/selectPowerPageList/struct.go @@ -5,9 +5,9 @@ package selectPowerPageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go b/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go index 424f90041..30fb4d658 100644 --- a/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go +++ b/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go @@ -1,11 +1,12 @@ package showAnalyzefxDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/showAnalyzefxDetail" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go b/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go index a11d27b59..c2235df48 100644 --- a/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go +++ b/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go @@ -5,9 +5,9 @@ package showAnalyzefxDetail import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showFxReport/data.go b/iSolarCloud/WebAppService/showFxReport/data.go index d7deceef8..bd93d16e6 100644 --- a/iSolarCloud/WebAppService/showFxReport/data.go +++ b/iSolarCloud/WebAppService/showFxReport/data.go @@ -1,11 +1,12 @@ package showFxReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/showFxReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/showFxReport/struct.go b/iSolarCloud/WebAppService/showFxReport/struct.go index a5d7d4340..d8de39969 100644 --- a/iSolarCloud/WebAppService/showFxReport/struct.go +++ b/iSolarCloud/WebAppService/showFxReport/struct.go @@ -5,9 +5,9 @@ package showFxReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showMaterNameList/data.go b/iSolarCloud/WebAppService/showMaterNameList/data.go index c75c8be98..9376116a9 100644 --- a/iSolarCloud/WebAppService/showMaterNameList/data.go +++ b/iSolarCloud/WebAppService/showMaterNameList/data.go @@ -1,11 +1,12 @@ package showMaterNameList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/showMaterNameList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/showMaterNameList/struct.go b/iSolarCloud/WebAppService/showMaterNameList/struct.go index d07aaa223..2a3a63884 100644 --- a/iSolarCloud/WebAppService/showMaterNameList/struct.go +++ b/iSolarCloud/WebAppService/showMaterNameList/struct.go @@ -5,9 +5,9 @@ package showMaterNameList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showMaterSubTypeList/data.go b/iSolarCloud/WebAppService/showMaterSubTypeList/data.go index fce105ede..57d59686a 100644 --- a/iSolarCloud/WebAppService/showMaterSubTypeList/data.go +++ b/iSolarCloud/WebAppService/showMaterSubTypeList/data.go @@ -1,11 +1,12 @@ package showMaterSubTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/showMaterSubTypeList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go b/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go index b47db6bbc..935ae7eb4 100644 --- a/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go +++ b/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go @@ -5,9 +5,9 @@ package showMaterSubTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showPSView/data.go b/iSolarCloud/WebAppService/showPSView/data.go index 7a45a2d80..02430cafd 100644 --- a/iSolarCloud/WebAppService/showPSView/data.go +++ b/iSolarCloud/WebAppService/showPSView/data.go @@ -1,10 +1,11 @@ package showPSView import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebAppService/showPSView/struct.go b/iSolarCloud/WebAppService/showPSView/struct.go index 51be3b86e..d469b891e 100644 --- a/iSolarCloud/WebAppService/showPSView/struct.go +++ b/iSolarCloud/WebAppService/showPSView/struct.go @@ -5,9 +5,9 @@ package showPSView import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/showTjReport/data.go b/iSolarCloud/WebAppService/showTjReport/data.go index 579c0d03f..d05cdcd71 100644 --- a/iSolarCloud/WebAppService/showTjReport/data.go +++ b/iSolarCloud/WebAppService/showTjReport/data.go @@ -1,10 +1,11 @@ package showTjReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -16,6 +17,7 @@ type RequestData struct { PsId valueTypes.PsId `json:"ps_id" required:"true"` MonthDate valueTypes.DateTime `json:"month_date" required:"true"` } + // ./goraw.sh WebAppService.showTjReport '{"ps_id":1171348,"month_date":"202210"}' func (rd RequestData) IsValid() error { @@ -27,7 +29,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { } diff --git a/iSolarCloud/WebAppService/showTjReport/struct.go b/iSolarCloud/WebAppService/showTjReport/struct.go index 27ee9b3cd..2eed26fd1 100644 --- a/iSolarCloud/WebAppService/showTjReport/struct.go +++ b/iSolarCloud/WebAppService/showTjReport/struct.go @@ -5,9 +5,9 @@ package showTjReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/struct.go b/iSolarCloud/WebAppService/struct.go index 1ff30a0fb..71ff67d59 100644 --- a/iSolarCloud/WebAppService/struct.go +++ b/iSolarCloud/WebAppService/struct.go @@ -2,199 +2,200 @@ package WebAppService import ( - "GoSungrow/iSolarCloud/WebAppService/addMaterial" - "GoSungrow/iSolarCloud/WebAppService/addOptTicketInfo" - "GoSungrow/iSolarCloud/WebAppService/addSpareParts" - "GoSungrow/iSolarCloud/WebAppService/associateQueryFaultNames" - "GoSungrow/iSolarCloud/WebAppService/auditPsDeviceCheck" - "GoSungrow/iSolarCloud/WebAppService/calcOutputRankByDay" - "GoSungrow/iSolarCloud/WebAppService/changeReadStatus" - "GoSungrow/iSolarCloud/WebAppService/checkMaterialName" - "GoSungrow/iSolarCloud/WebAppService/confirmFault" - "GoSungrow/iSolarCloud/WebAppService/copeOperateTicket" - "GoSungrow/iSolarCloud/WebAppService/copySecondTypeTicket" - "GoSungrow/iSolarCloud/WebAppService/copyWorkTicket" - "GoSungrow/iSolarCloud/WebAppService/delOptTicketInfo" - "GoSungrow/iSolarCloud/WebAppService/deleteDuty" - "GoSungrow/iSolarCloud/WebAppService/deleteDutyMid" - "GoSungrow/iSolarCloud/WebAppService/deleteMaterial" - "GoSungrow/iSolarCloud/WebAppService/deleteOrSharedSelfReport" - "GoSungrow/iSolarCloud/WebAppService/deleteSecondTypeTicket" - "GoSungrow/iSolarCloud/WebAppService/deleteSparePartsById" - "GoSungrow/iSolarCloud/WebAppService/deleteWorkTicket" - "GoSungrow/iSolarCloud/WebAppService/deviceFactoryList" - "GoSungrow/iSolarCloud/WebAppService/dispartDataPageList" - "GoSungrow/iSolarCloud/WebAppService/executeTask" - "GoSungrow/iSolarCloud/WebAppService/findCurrentTask" - "GoSungrow/iSolarCloud/WebAppService/findDeviceMessageByPskey" - "GoSungrow/iSolarCloud/WebAppService/findFactoryMessage" - "GoSungrow/iSolarCloud/WebAppService/findImgResources" - "GoSungrow/iSolarCloud/WebAppService/findMateiralSubType" - "GoSungrow/iSolarCloud/WebAppService/findMaterialById" - "GoSungrow/iSolarCloud/WebAppService/findMyDealedCurrentTask" - "GoSungrow/iSolarCloud/WebAppService/findMyDealedImgResources" - "GoSungrow/iSolarCloud/WebAppService/findSeriesInverterData" - "GoSungrow/iSolarCloud/WebAppService/findWebRole" - "GoSungrow/iSolarCloud/WebAppService/getAllPsFaultCount" - "GoSungrow/iSolarCloud/WebAppService/getAllPsFaultCountByUserId" - "GoSungrow/iSolarCloud/WebAppService/getAllPsList" - "GoSungrow/iSolarCloud/WebAppService/getAllStore" - "GoSungrow/iSolarCloud/WebAppService/getBaseDeviceInfo" - "GoSungrow/iSolarCloud/WebAppService/getBoxData" - "GoSungrow/iSolarCloud/WebAppService/getCBoxTree" - "GoSungrow/iSolarCloud/WebAppService/getCheckDevTypeList" - "GoSungrow/iSolarCloud/WebAppService/getCheckUserList" - "GoSungrow/iSolarCloud/WebAppService/getChildOrg" - "GoSungrow/iSolarCloud/WebAppService/getCo" - "GoSungrow/iSolarCloud/WebAppService/getCodeTreeMap" - "GoSungrow/iSolarCloud/WebAppService/getDST" - "GoSungrow/iSolarCloud/WebAppService/getDataCounts" - "GoSungrow/iSolarCloud/WebAppService/getDataInfo" - "GoSungrow/iSolarCloud/WebAppService/getDevList" - "GoSungrow/iSolarCloud/WebAppService/getDevName" - "GoSungrow/iSolarCloud/WebAppService/getDevTypeList" - "GoSungrow/iSolarCloud/WebAppService/getDeviceDataList" - "GoSungrow/iSolarCloud/WebAppService/getDeviceFactory" - "GoSungrow/iSolarCloud/WebAppService/getDeviceInfoForCheck" - "GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" - "GoSungrow/iSolarCloud/WebAppService/getDeviceTreeChild" - "GoSungrow/iSolarCloud/WebAppService/getDeviceUuid" - "GoSungrow/iSolarCloud/WebAppService/getDutyInfoById" - "GoSungrow/iSolarCloud/WebAppService/getDutyOrgZtree" - "GoSungrow/iSolarCloud/WebAppService/getElecEffectList" - "GoSungrow/iSolarCloud/WebAppService/getEnvironmentInfo" - "GoSungrow/iSolarCloud/WebAppService/getFaultList" - "GoSungrow/iSolarCloud/WebAppService/getFaultName" - "GoSungrow/iSolarCloud/WebAppService/getFaultOrder" - "GoSungrow/iSolarCloud/WebAppService/getFaultOrderByOrderId" - "GoSungrow/iSolarCloud/WebAppService/getFaultOrderList" - "GoSungrow/iSolarCloud/WebAppService/getFaultOrderStepList" - "GoSungrow/iSolarCloud/WebAppService/getHTRoleList" - "GoSungrow/iSolarCloud/WebAppService/getHistoryComments" - "GoSungrow/iSolarCloud/WebAppService/getInfo" - "GoSungrow/iSolarCloud/WebAppService/getInverteTableListCount" - "GoSungrow/iSolarCloud/WebAppService/getInverterDiscreteDistributioList" - "GoSungrow/iSolarCloud/WebAppService/getInverterDiscreteList" - "GoSungrow/iSolarCloud/WebAppService/getInverterFactoryList" - "GoSungrow/iSolarCloud/WebAppService/getInverterInfo" - "GoSungrow/iSolarCloud/WebAppService/getLoadCurveList" - "GoSungrow/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey" - "GoSungrow/iSolarCloud/WebAppService/getMultiPowers" - "GoSungrow/iSolarCloud/WebAppService/getOndutyQuery" - "GoSungrow/iSolarCloud/WebAppService/getOperateTicketUserList" - "GoSungrow/iSolarCloud/WebAppService/getOptTicketsAttachments" - "GoSungrow/iSolarCloud/WebAppService/getOrderCount" - "GoSungrow/iSolarCloud/WebAppService/getOrderData" - "GoSungrow/iSolarCloud/WebAppService/getOrderDataSize" - "GoSungrow/iSolarCloud/WebAppService/getOrgPsEquipmentList" - "GoSungrow/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport" - "GoSungrow/iSolarCloud/WebAppService/getParentUidChain" - "GoSungrow/iSolarCloud/WebAppService/getPowerKwhkwpList" - "GoSungrow/iSolarCloud/WebAppService/getPowerPrList" - "GoSungrow/iSolarCloud/WebAppService/getPowerPredictionInfo" - "GoSungrow/iSolarCloud/WebAppService/getPowerTrendDayData" - "GoSungrow/iSolarCloud/WebAppService/getPowerTrendMonthData" - "GoSungrow/iSolarCloud/WebAppService/getPowerTrendYearData" - "GoSungrow/iSolarCloud/WebAppService/getPowerValue" - "GoSungrow/iSolarCloud/WebAppService/getPsBlock" - "GoSungrow/iSolarCloud/WebAppService/getPsBlockData" - "GoSungrow/iSolarCloud/WebAppService/getPsBlockTree" - "GoSungrow/iSolarCloud/WebAppService/getPsBoxListCount" - "GoSungrow/iSolarCloud/WebAppService/getPsCBoxDetail" - "GoSungrow/iSolarCloud/WebAppService/getPsContact" - "GoSungrow/iSolarCloud/WebAppService/getPsDataVal" - "GoSungrow/iSolarCloud/WebAppService/getPsDeviceCheckList" - "GoSungrow/iSolarCloud/WebAppService/getPsDeviceFaultList" - "GoSungrow/iSolarCloud/WebAppService/getPsFaultList" - "GoSungrow/iSolarCloud/WebAppService/getPsIdByUserId" - "GoSungrow/iSolarCloud/WebAppService/getPsIdState" - "GoSungrow/iSolarCloud/WebAppService/getPsList" - "GoSungrow/iSolarCloud/WebAppService/getPsListForWorkTicket" - "GoSungrow/iSolarCloud/WebAppService/getPsPictureMessage" - "GoSungrow/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum" - "GoSungrow/iSolarCloud/WebAppService/getPsTree" - "GoSungrow/iSolarCloud/WebAppService/getPsTreeChild" - "GoSungrow/iSolarCloud/WebAppService/getPsUserList" - "GoSungrow/iSolarCloud/WebAppService/getPsValue" - "GoSungrow/iSolarCloud/WebAppService/getPscSeriseData" - "GoSungrow/iSolarCloud/WebAppService/getReportInfoByReportId" - "GoSungrow/iSolarCloud/WebAppService/getReportListByType" - "GoSungrow/iSolarCloud/WebAppService/getReportPsTree" - "GoSungrow/iSolarCloud/WebAppService/getRoleList" - "GoSungrow/iSolarCloud/WebAppService/getSafeEffectList" - "GoSungrow/iSolarCloud/WebAppService/getSecondTypeTicketList" - "GoSungrow/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail" - "GoSungrow/iSolarCloud/WebAppService/getSelfReportPoint" - "GoSungrow/iSolarCloud/WebAppService/getSparePartsDetail" - "GoSungrow/iSolarCloud/WebAppService/getStatementList" - "GoSungrow/iSolarCloud/WebAppService/getStoreByStationId" - "GoSungrow/iSolarCloud/WebAppService/getSysUserList" - "GoSungrow/iSolarCloud/WebAppService/getTableList" - "GoSungrow/iSolarCloud/WebAppService/getUserList" - "GoSungrow/iSolarCloud/WebAppService/getWeather" - "GoSungrow/iSolarCloud/WebAppService/getWorkTicketList" - "GoSungrow/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail" - "GoSungrow/iSolarCloud/WebAppService/getWorkTicketRunningCount" - "GoSungrow/iSolarCloud/WebAppService/getWorkTicketUserList" - "GoSungrow/iSolarCloud/WebAppService/getinverterType" - "GoSungrow/iSolarCloud/WebAppService/getreportPermissionByUser" - "GoSungrow/iSolarCloud/WebAppService/handleValue" - "GoSungrow/iSolarCloud/WebAppService/modifyDeviceInfo" - "GoSungrow/iSolarCloud/WebAppService/operaStoreSpareParts" - "GoSungrow/iSolarCloud/WebAppService/operateBillTransferToUser" - "GoSungrow/iSolarCloud/WebAppService/queryAllStockInventory" - "GoSungrow/iSolarCloud/WebAppService/queryBatteryBoardsList" - "GoSungrow/iSolarCloud/WebAppService/queryBatteryBoardsPointsData" - "GoSungrow/iSolarCloud/WebAppService/queryCodeByType" - "GoSungrow/iSolarCloud/WebAppService/queryDeviceInfoList" - "GoSungrow/iSolarCloud/WebAppService/queryElectricityCalendarData" - "GoSungrow/iSolarCloud/WebAppService/queryFaultCodes" - "GoSungrow/iSolarCloud/WebAppService/queryFaultLevelAndType" - "GoSungrow/iSolarCloud/WebAppService/queryFaultNames" - "GoSungrow/iSolarCloud/WebAppService/queryMaterialType" - "GoSungrow/iSolarCloud/WebAppService/queryNounAndKlgList" - "GoSungrow/iSolarCloud/WebAppService/queryNounList" - "GoSungrow/iSolarCloud/WebAppService/queryOptTickctInfo" - "GoSungrow/iSolarCloud/WebAppService/queryOrgIdByUser" - "GoSungrow/iSolarCloud/WebAppService/queryPsCountryList" - "GoSungrow/iSolarCloud/WebAppService/queryPsProvcnList" - "GoSungrow/iSolarCloud/WebAppService/queryPsTypeByPsId" - "GoSungrow/iSolarCloud/WebAppService/querySparePartsList" - "GoSungrow/iSolarCloud/WebAppService/queryStoreList" - "GoSungrow/iSolarCloud/WebAppService/querySysTimezone" - "GoSungrow/iSolarCloud/WebAppService/queryUnInventorySpareList" - "GoSungrow/iSolarCloud/WebAppService/queryUserCurveTemplateData" - "GoSungrow/iSolarCloud/WebAppService/renewOperation" - "GoSungrow/iSolarCloud/WebAppService/saveCustomReport" - "GoSungrow/iSolarCloud/WebAppService/saveDutyInfo" - "GoSungrow/iSolarCloud/WebAppService/saveInventory" - "GoSungrow/iSolarCloud/WebAppService/saveMaterial" - "GoSungrow/iSolarCloud/WebAppService/saveSecondTypeTicket" - "GoSungrow/iSolarCloud/WebAppService/saveSelfReportPoint" - "GoSungrow/iSolarCloud/WebAppService/saveWorkTicket" - "GoSungrow/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep" - "GoSungrow/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep" - "GoSungrow/iSolarCloud/WebAppService/secondTypeUpdateSign" - "GoSungrow/iSolarCloud/WebAppService/selectPowerPageList" - "GoSungrow/iSolarCloud/WebAppService/showAnalyzefxDetail" - "GoSungrow/iSolarCloud/WebAppService/showFxReport" - "GoSungrow/iSolarCloud/WebAppService/showMaterNameList" - "GoSungrow/iSolarCloud/WebAppService/showMaterSubTypeList" - "GoSungrow/iSolarCloud/WebAppService/showPSView" - "GoSungrow/iSolarCloud/WebAppService/showTjReport" - "GoSungrow/iSolarCloud/WebAppService/templateLikesInfo" - "GoSungrow/iSolarCloud/WebAppService/updOptTicketInfo" - "GoSungrow/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess" - "GoSungrow/iSolarCloud/WebAppService/updateBillTicketForTask" - "GoSungrow/iSolarCloud/WebAppService/updateDutyInfo" - "GoSungrow/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber" - "GoSungrow/iSolarCloud/WebAppService/updateMaterial" - "GoSungrow/iSolarCloud/WebAppService/updateSpareParts" - "GoSungrow/iSolarCloud/WebAppService/updateStopReason" - "GoSungrow/iSolarCloud/WebAppService/updateTemplate" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/addMaterial" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/addOptTicketInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/addSpareParts" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/associateQueryFaultNames" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/auditPsDeviceCheck" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/calcOutputRankByDay" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/changeReadStatus" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/checkMaterialName" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/confirmFault" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/copeOperateTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/copySecondTypeTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/copyWorkTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/delOptTicketInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteDuty" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteDutyMid" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteMaterial" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteOrSharedSelfReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteSecondTypeTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteSparePartsById" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deleteWorkTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/deviceFactoryList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/dispartDataPageList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/executeTask" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findCurrentTask" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findDeviceMessageByPskey" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findFactoryMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findImgResources" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findMateiralSubType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findMaterialById" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findMyDealedCurrentTask" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findMyDealedImgResources" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findSeriesInverterData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/findWebRole" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getAllPsFaultCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getAllPsFaultCountByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getAllPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getAllStore" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getBaseDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getBoxData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getCBoxTree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getCheckDevTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getCheckUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getChildOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getCo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getCodeTreeMap" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDST" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDataCounts" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDataInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevName" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDeviceDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDeviceFactory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDeviceInfoForCheck" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDeviceTreeChild" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDeviceUuid" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDutyInfoById" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDutyOrgZtree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getElecEffectList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getEnvironmentInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultName" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultOrder" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultOrderByOrderId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultOrderList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getFaultOrderStepList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getHTRoleList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getHistoryComments" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInverteTableListCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInverterDiscreteDistributioList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInverterDiscreteList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInverterFactoryList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getInverterInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getLoadCurveList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getMultiPowers" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOndutyQuery" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOperateTicketUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOptTicketsAttachments" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOrderCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOrderData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOrderDataSize" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOrgPsEquipmentList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getParentUidChain" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerKwhkwpList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerPrList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerPredictionInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerTrendDayData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerTrendMonthData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerTrendYearData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPowerValue" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsBlock" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsBlockData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsBlockTree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsBoxListCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsCBoxDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsContact" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsDataVal" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsDeviceCheckList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsDeviceFaultList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsFaultList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsIdByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsIdState" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsListForWorkTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsPictureMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsTree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsTreeChild" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsValue" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPscSeriseData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getReportInfoByReportId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getReportListByType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getReportPsTree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getRoleList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSafeEffectList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSecondTypeTicketList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSelfReportPoint" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSparePartsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getStatementList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getStoreByStationId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getSysUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getTableList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getWeather" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getWorkTicketList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getWorkTicketRunningCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getWorkTicketUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getinverterType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getreportPermissionByUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/handleValue" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/modifyDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/operaStoreSpareParts" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/operateBillTransferToUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryAllStockInventory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryBatteryBoardsList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryBatteryBoardsPointsData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryCodeByType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryDeviceInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryElectricityCalendarData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryFaultCodes" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryFaultLevelAndType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryFaultNames" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryMaterialType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryNounAndKlgList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryNounList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryOptTickctInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryOrgIdByUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryPsCountryList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryPsProvcnList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryPsTypeByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/querySparePartsList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryStoreList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/querySysTimezone" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryUnInventorySpareList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryUserCurveTemplateData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/renewOperation" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveCustomReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveInventory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveMaterial" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveSecondTypeTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveSelfReportPoint" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/saveWorkTicket" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/secondTypeUpdateSign" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/selectPowerPageList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showAnalyzefxDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showFxReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showMaterNameList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showMaterSubTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showPSView" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showTjReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/templateLikesInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updOptTicketInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateBillTicketForTask" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateDutyInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateMaterial" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateSpareParts" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateStopReason" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/updateTemplate" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) var _ api.Area = (*Area)(nil) @@ -216,8 +217,7 @@ func Init(apiRoot api.Web) Area { api.GetName(getDeviceUuid.EndPoint{}): getDeviceUuid.Init(apiRoot), // /v1/devService/getDeviceUuid} // Discovered from Chrome Dev Tools - api.GetName(getMqttConfigInfoByAppkey.EndPoint{}): getMqttConfigInfoByAppkey.Init(apiRoot), // /v1/devService/getDeviceUuid} - + api.GetName(getMqttConfigInfoByAppkey.EndPoint{}): getMqttConfigInfoByAppkey.Init(apiRoot), // /v1/devService/getDeviceUuid} api.GetName(addMaterial.EndPoint{}): addMaterial.Init(apiRoot), // /v1/otherService/addMaterial} api.GetName(addOptTicketInfo.EndPoint{}): addOptTicketInfo.Init(apiRoot), // /v1/faultService/addOptTicketInfo} diff --git a/iSolarCloud/WebAppService/templateLikesInfo/data.go b/iSolarCloud/WebAppService/templateLikesInfo/data.go index c7cf3aa25..79f65b3c1 100644 --- a/iSolarCloud/WebAppService/templateLikesInfo/data.go +++ b/iSolarCloud/WebAppService/templateLikesInfo/data.go @@ -1,11 +1,12 @@ package templateLikesInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/templateLikesInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/templateLikesInfo/struct.go b/iSolarCloud/WebAppService/templateLikesInfo/struct.go index 528c9e519..519321250 100644 --- a/iSolarCloud/WebAppService/templateLikesInfo/struct.go +++ b/iSolarCloud/WebAppService/templateLikesInfo/struct.go @@ -5,9 +5,9 @@ package templateLikesInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updOptTicketInfo/data.go b/iSolarCloud/WebAppService/updOptTicketInfo/data.go index 6814058d6..73588b7c4 100644 --- a/iSolarCloud/WebAppService/updOptTicketInfo/data.go +++ b/iSolarCloud/WebAppService/updOptTicketInfo/data.go @@ -1,11 +1,12 @@ package updOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updOptTicketInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updOptTicketInfo/struct.go b/iSolarCloud/WebAppService/updOptTicketInfo/struct.go index 43dea39af..a82520cf5 100644 --- a/iSolarCloud/WebAppService/updOptTicketInfo/struct.go +++ b/iSolarCloud/WebAppService/updOptTicketInfo/struct.go @@ -5,9 +5,9 @@ package updOptTicketInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go index bdc4f03fb..1b73b7a6c 100644 --- a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go +++ b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go @@ -1,11 +1,12 @@ package updataWorkTicketAfterStartProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updataWorkTicketAfterStartProcess" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go index 67593197f..ec26144dc 100644 --- a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go +++ b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go @@ -5,9 +5,9 @@ package updataWorkTicketAfterStartProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateBillTicketForTask/data.go b/iSolarCloud/WebAppService/updateBillTicketForTask/data.go index b47ee839f..b5b00c824 100644 --- a/iSolarCloud/WebAppService/updateBillTicketForTask/data.go +++ b/iSolarCloud/WebAppService/updateBillTicketForTask/data.go @@ -1,11 +1,12 @@ package updateBillTicketForTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateBillTicketForTask" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go b/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go index 6eba14ba2..5785b25f9 100644 --- a/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go +++ b/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go @@ -5,9 +5,9 @@ package updateBillTicketForTask import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateDutyInfo/data.go b/iSolarCloud/WebAppService/updateDutyInfo/data.go index ccc5e75ce..eadce2e24 100644 --- a/iSolarCloud/WebAppService/updateDutyInfo/data.go +++ b/iSolarCloud/WebAppService/updateDutyInfo/data.go @@ -1,11 +1,12 @@ package updateDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/updateDutyInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateDutyInfo/struct.go b/iSolarCloud/WebAppService/updateDutyInfo/struct.go index 95e155b5c..2ea774049 100644 --- a/iSolarCloud/WebAppService/updateDutyInfo/struct.go +++ b/iSolarCloud/WebAppService/updateDutyInfo/struct.go @@ -5,9 +5,9 @@ package updateDutyInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go index 55f769ba4..845be763a 100644 --- a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go +++ b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go @@ -1,11 +1,12 @@ package updateKnowledgeBaseUseNumber import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateKnowledgeBaseUseNumber" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go index 5147e2ca8..1f58f1ae6 100644 --- a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go +++ b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go @@ -5,9 +5,9 @@ package updateKnowledgeBaseUseNumber import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateMaterial/data.go b/iSolarCloud/WebAppService/updateMaterial/data.go index 7f27d9cf9..3c4d5f947 100644 --- a/iSolarCloud/WebAppService/updateMaterial/data.go +++ b/iSolarCloud/WebAppService/updateMaterial/data.go @@ -1,11 +1,12 @@ package updateMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/updateMaterial" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateMaterial/struct.go b/iSolarCloud/WebAppService/updateMaterial/struct.go index 012e1258d..3d5e97798 100644 --- a/iSolarCloud/WebAppService/updateMaterial/struct.go +++ b/iSolarCloud/WebAppService/updateMaterial/struct.go @@ -5,9 +5,9 @@ package updateMaterial import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateSpareParts/data.go b/iSolarCloud/WebAppService/updateSpareParts/data.go index 1d53f78c0..c9ebeab0f 100644 --- a/iSolarCloud/WebAppService/updateSpareParts/data.go +++ b/iSolarCloud/WebAppService/updateSpareParts/data.go @@ -1,11 +1,12 @@ package updateSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/updateSpareParts" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateSpareParts/struct.go b/iSolarCloud/WebAppService/updateSpareParts/struct.go index aeea6d086..341b8cd34 100644 --- a/iSolarCloud/WebAppService/updateSpareParts/struct.go +++ b/iSolarCloud/WebAppService/updateSpareParts/struct.go @@ -5,9 +5,9 @@ package updateSpareParts import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateStopReason/data.go b/iSolarCloud/WebAppService/updateStopReason/data.go index 93f8a7604..6dbf560f7 100644 --- a/iSolarCloud/WebAppService/updateStopReason/data.go +++ b/iSolarCloud/WebAppService/updateStopReason/data.go @@ -1,11 +1,12 @@ package updateStopReason import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updateStopReason" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateStopReason/struct.go b/iSolarCloud/WebAppService/updateStopReason/struct.go index f19631ffc..0c43b8521 100644 --- a/iSolarCloud/WebAppService/updateStopReason/struct.go +++ b/iSolarCloud/WebAppService/updateStopReason/struct.go @@ -5,9 +5,9 @@ package updateStopReason import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebAppService/updateTemplate/data.go b/iSolarCloud/WebAppService/updateTemplate/data.go index c3293c806..763b86a01 100644 --- a/iSolarCloud/WebAppService/updateTemplate/data.go +++ b/iSolarCloud/WebAppService/updateTemplate/data.go @@ -1,11 +1,12 @@ package updateTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateKnowledgeBaseCitationCount" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebAppService/updateTemplate/struct.go b/iSolarCloud/WebAppService/updateTemplate/struct.go index b97343625..d57da415b 100644 --- a/iSolarCloud/WebAppService/updateTemplate/struct.go +++ b/iSolarCloud/WebAppService/updateTemplate/struct.go @@ -5,9 +5,9 @@ package updateTemplate import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go index fde57d85f..d34a32b52 100644 --- a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go @@ -1,11 +1,12 @@ package addPowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDevSysTypeAndFactoryList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go index 7ab4ff399..eb63ecb0a 100644 --- a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go @@ -5,9 +5,9 @@ package addPowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go b/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go index 664020a6e..a25316c87 100644 --- a/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go +++ b/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go @@ -1,11 +1,12 @@ package addPowerPointManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/addPowerPointManage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go b/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go index 912254f74..544b7bb09 100644 --- a/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go +++ b/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go @@ -5,9 +5,9 @@ package addPowerPointManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go b/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go index a95ab3d25..6d8289b89 100644 --- a/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go +++ b/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go @@ -1,11 +1,12 @@ package addSubTypeDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/addSubTypeDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go b/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go index f78441bb7..70b226917 100644 --- a/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go @@ -5,9 +5,9 @@ package addSubTypeDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go index e0366025f..66793d757 100644 --- a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go +++ b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go @@ -1,11 +1,12 @@ package batchAddDevicesPropertis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchAddDevicesPropertis" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go index 89cc7ba32..3d079e9fb 100644 --- a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go +++ b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go @@ -5,9 +5,9 @@ package batchAddDevicesPropertis import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/batchDelDevice/data.go b/iSolarCloud/WebIscmAppService/batchDelDevice/data.go index 1d1f70e13..b7aff0fd6 100644 --- a/iSolarCloud/WebIscmAppService/batchDelDevice/data.go +++ b/iSolarCloud/WebIscmAppService/batchDelDevice/data.go @@ -1,11 +1,12 @@ package batchDelDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchDelDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go b/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go index c3c08e089..44e69d654 100644 --- a/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go @@ -5,9 +5,9 @@ package batchDelDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go index 1dbf9beb4..9c7696276 100644 --- a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go +++ b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go @@ -1,11 +1,12 @@ package batchSavePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/batchSavePowerDeviceTechnical" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go index 9acd8647b..7c9e504ba 100644 --- a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go +++ b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go @@ -5,9 +5,9 @@ package batchSavePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go index 3c4122df5..7aa1df2b3 100644 --- a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go @@ -1,9 +1,9 @@ package checkDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go index f2be8a111..02c5d23ce 100644 --- a/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go @@ -5,9 +5,9 @@ package checkDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go b/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go index 83e39a24f..67cef72be 100644 --- a/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go +++ b/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go @@ -1,8 +1,8 @@ package contactMessageOpera import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go b/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go index f706a0538..a03b75907 100644 --- a/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go +++ b/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go @@ -5,9 +5,9 @@ package contactMessageOpera import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/delDevice/data.go b/iSolarCloud/WebIscmAppService/delDevice/data.go index a293eba93..c49680ac5 100644 --- a/iSolarCloud/WebIscmAppService/delDevice/data.go +++ b/iSolarCloud/WebIscmAppService/delDevice/data.go @@ -1,11 +1,12 @@ package delDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/delDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/delDevice/struct.go b/iSolarCloud/WebIscmAppService/delDevice/struct.go index ce56d910e..f8f18eded 100644 --- a/iSolarCloud/WebIscmAppService/delDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/delDevice/struct.go @@ -5,9 +5,9 @@ package delDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go index a13c6ea93..0e1d5f1b7 100644 --- a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go +++ b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go @@ -1,11 +1,12 @@ package deleteDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteDeviceFactory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go index bb5ccf816..46a73c2e5 100644 --- a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go @@ -5,9 +5,9 @@ package deleteDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go b/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go index 1a5bbb136..e318fec9e 100644 --- a/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go +++ b/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go @@ -1,11 +1,12 @@ package deleteDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deleteDeviceType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go b/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go index c76a4bd95..235b8e602 100644 --- a/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go @@ -5,9 +5,9 @@ package deleteDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteMenu/data.go b/iSolarCloud/WebIscmAppService/deleteMenu/data.go index b72330780..73c2bc504 100644 --- a/iSolarCloud/WebIscmAppService/deleteMenu/data.go +++ b/iSolarCloud/WebIscmAppService/deleteMenu/data.go @@ -1,11 +1,12 @@ package deleteMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/deleteMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteMenu/struct.go b/iSolarCloud/WebIscmAppService/deleteMenu/struct.go index a71d1c029..8ef56d3df 100644 --- a/iSolarCloud/WebIscmAppService/deleteMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteMenu/struct.go @@ -5,9 +5,9 @@ package deleteMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go b/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go index f34b1cca7..feb413357 100644 --- a/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go +++ b/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go @@ -1,11 +1,12 @@ package deleteOneNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deleteOneNotice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go b/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go index b202ddd55..c380f8fa9 100644 --- a/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go @@ -5,9 +5,9 @@ package deleteOneNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go index 3ffb3969d..01daa4bc6 100644 --- a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go +++ b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go @@ -1,11 +1,12 @@ package deleteOrgNodeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/deleteOrgNodeInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go index ff1254fd6..22474b242 100644 --- a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go @@ -5,9 +5,9 @@ package deleteOrgNodeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePicture/data.go b/iSolarCloud/WebIscmAppService/deletePicture/data.go index 6c60ec003..9812484f3 100644 --- a/iSolarCloud/WebIscmAppService/deletePicture/data.go +++ b/iSolarCloud/WebIscmAppService/deletePicture/data.go @@ -1,11 +1,12 @@ package deletePicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/deletePicture" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePicture/struct.go b/iSolarCloud/WebIscmAppService/deletePicture/struct.go index c490eaed0..171d1df3c 100644 --- a/iSolarCloud/WebIscmAppService/deletePicture/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePicture/struct.go @@ -5,9 +5,9 @@ package deletePicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePointInfo/data.go b/iSolarCloud/WebIscmAppService/deletePointInfo/data.go index 30df57d2c..b90eab157 100644 --- a/iSolarCloud/WebIscmAppService/deletePointInfo/data.go +++ b/iSolarCloud/WebIscmAppService/deletePointInfo/data.go @@ -1,11 +1,12 @@ package deletePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePointInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go b/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go index 37d576186..f71dc3997 100644 --- a/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go @@ -5,9 +5,9 @@ package deletePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go index 1b27f1a4f..1d4efe91f 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go @@ -1,11 +1,12 @@ package deletePowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerDeviceChannl" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go index df2d18dc6..81f604e1c 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go @@ -5,9 +5,9 @@ package deletePowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go index 32ec6aec7..c2b0a85e5 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go @@ -1,11 +1,12 @@ package deletePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerDeviceModel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go index fa519f228..7cbb46580 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go @@ -5,9 +5,9 @@ package deletePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go index 51c9decb7..2b222596a 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go @@ -1,11 +1,12 @@ package deletePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerDeviceParameterPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go index b6e131cf9..5865f1993 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go @@ -5,9 +5,9 @@ package deletePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go index 3c563618f..613d27c9c 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go @@ -1,11 +1,12 @@ package deletePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerDeviceSubType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go index c4a740c5c..da55b5a75 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go @@ -5,9 +5,9 @@ package deletePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go index d22980cb6..5087c6dcd 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go @@ -1,11 +1,12 @@ package deletePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/deletePowerDeviceTechnical" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go index 12fa93c84..d6fe494f3 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go @@ -5,9 +5,9 @@ package deletePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deletePowerStore/data.go b/iSolarCloud/WebIscmAppService/deletePowerStore/data.go index 8213333e4..9946db253 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerStore/data.go +++ b/iSolarCloud/WebIscmAppService/deletePowerStore/data.go @@ -1,11 +1,12 @@ package deletePowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/deletePowerStore" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go b/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go index 8a36bc9a6..4dc125a80 100644 --- a/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go +++ b/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go @@ -5,9 +5,9 @@ package deletePowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go index bb21a1c09..2f7b76c1c 100644 --- a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go +++ b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go @@ -1,11 +1,12 @@ package deleteProcessDefinition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deleteProcessDefinition" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go index de3f751a1..74e44df99 100644 --- a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go @@ -5,9 +5,9 @@ package deleteProcessDefinition import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteReport/data.go b/iSolarCloud/WebIscmAppService/deleteReport/data.go index be9d798c5..22904d7b6 100644 --- a/iSolarCloud/WebIscmAppService/deleteReport/data.go +++ b/iSolarCloud/WebIscmAppService/deleteReport/data.go @@ -1,11 +1,12 @@ package deleteReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/deleteReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteReport/struct.go b/iSolarCloud/WebIscmAppService/deleteReport/struct.go index 5848079fc..643ad58a4 100644 --- a/iSolarCloud/WebIscmAppService/deleteReport/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteReport/struct.go @@ -5,9 +5,9 @@ package deleteReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deleteUserNode/data.go b/iSolarCloud/WebIscmAppService/deleteUserNode/data.go index 1d3a31719..1733cf0f8 100644 --- a/iSolarCloud/WebIscmAppService/deleteUserNode/data.go +++ b/iSolarCloud/WebIscmAppService/deleteUserNode/data.go @@ -1,11 +1,12 @@ package deleteUserNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/deleteUserNode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go b/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go index c67b4ee2d..452e75246 100644 --- a/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go +++ b/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go @@ -5,9 +5,9 @@ package deleteUserNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/deployProcess/data.go b/iSolarCloud/WebIscmAppService/deployProcess/data.go index 8a434e074..8a12c812b 100644 --- a/iSolarCloud/WebIscmAppService/deployProcess/data.go +++ b/iSolarCloud/WebIscmAppService/deployProcess/data.go @@ -1,11 +1,12 @@ package deployProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/deployProcess" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/deployProcess/struct.go b/iSolarCloud/WebIscmAppService/deployProcess/struct.go index 776f02902..877bccf44 100644 --- a/iSolarCloud/WebIscmAppService/deployProcess/struct.go +++ b/iSolarCloud/WebIscmAppService/deployProcess/struct.go @@ -5,9 +5,9 @@ package deployProcess import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go b/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go index 47ab25b2f..8865b47ee 100644 --- a/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go +++ b/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go @@ -1,11 +1,12 @@ package editProcessManageAction import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/editProcessManageAction" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go b/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go index da26862f9..297bf1300 100644 --- a/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go +++ b/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go @@ -5,9 +5,9 @@ package editProcessManageAction import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go b/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go index 088d07830..6ee7e697a 100644 --- a/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go +++ b/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go @@ -1,8 +1,8 @@ package findImageInputStreamString import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go b/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go index 4d6d946b5..d78ed4240 100644 --- a/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go +++ b/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go @@ -5,9 +5,9 @@ package findImageInputStreamString import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go b/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go index 80d0a5ede..2f8f733a0 100644 --- a/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go +++ b/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go @@ -1,10 +1,11 @@ package getAllDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,12 +25,11 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DevTypeCode"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DevTypeCode"` DevTypeCode valueTypes.Integer `json:"devtypecode" PointId:"dev_type_code"` - DevTypeName valueTypes.String `json:"devtypename" PointId:"dev_type_name"` + DevTypeName valueTypes.String `json:"devtypename" PointId:"dev_type_name"` } func (e *ResultData) IsValid() error { @@ -37,7 +37,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go b/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go index 6c9235592..88c4e7bee 100644 --- a/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go +++ b/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go @@ -5,9 +5,9 @@ package getAllDevTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go b/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go index c73eeb322..52c4047dd 100644 --- a/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go +++ b/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go @@ -1,8 +1,8 @@ package getAllNodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go b/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go index c12311d2b..d8471245c 100644 --- a/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go +++ b/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go @@ -5,9 +5,9 @@ package getAllNodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getAuthKey/data.go b/iSolarCloud/WebIscmAppService/getAuthKey/data.go index a154f5bee..5844a1535 100644 --- a/iSolarCloud/WebIscmAppService/getAuthKey/data.go +++ b/iSolarCloud/WebIscmAppService/getAuthKey/data.go @@ -1,8 +1,8 @@ package getAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getAuthKey/struct.go b/iSolarCloud/WebIscmAppService/getAuthKey/struct.go index c5c094f4f..0bd740740 100644 --- a/iSolarCloud/WebIscmAppService/getAuthKey/struct.go +++ b/iSolarCloud/WebIscmAppService/getAuthKey/struct.go @@ -5,9 +5,9 @@ package getAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go b/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go index 00b49f0db..ead3dec99 100644 --- a/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go +++ b/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go @@ -1,9 +1,9 @@ package getAuthKeyList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go b/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go index 7d130e92a..39c71a306 100644 --- a/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go +++ b/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go @@ -5,9 +5,9 @@ package getAuthKeyList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getCodeByType/data.go b/iSolarCloud/WebIscmAppService/getCodeByType/data.go index f2875c693..bf51d5abf 100644 --- a/iSolarCloud/WebIscmAppService/getCodeByType/data.go +++ b/iSolarCloud/WebIscmAppService/getCodeByType/data.go @@ -1,9 +1,9 @@ package getCodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getCodeByType/struct.go b/iSolarCloud/WebIscmAppService/getCodeByType/struct.go index 97c1eebd0..186630afa 100644 --- a/iSolarCloud/WebIscmAppService/getCodeByType/struct.go +++ b/iSolarCloud/WebIscmAppService/getCodeByType/struct.go @@ -5,9 +5,9 @@ package getCodeByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getContactMessage/data.go b/iSolarCloud/WebIscmAppService/getContactMessage/data.go index 0a242d4f6..3a7f74ac8 100644 --- a/iSolarCloud/WebIscmAppService/getContactMessage/data.go +++ b/iSolarCloud/WebIscmAppService/getContactMessage/data.go @@ -1,9 +1,9 @@ package getContactMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.getContactMessage" type RequestData struct { - PsId2 valueTypes.PsId `json:"psId" require:"true"` + PsId2 valueTypes.PsId `json:"psId" require:"true"` } func (rd RequestData) IsValid() error { diff --git a/iSolarCloud/WebIscmAppService/getContactMessage/struct.go b/iSolarCloud/WebIscmAppService/getContactMessage/struct.go index 61f0d9ab4..0e67f7001 100644 --- a/iSolarCloud/WebIscmAppService/getContactMessage/struct.go +++ b/iSolarCloud/WebIscmAppService/getContactMessage/struct.go @@ -5,9 +5,9 @@ package getContactMessage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getCountryNew/data.go b/iSolarCloud/WebIscmAppService/getCountryNew/data.go index 2fa3a2e12..e3cccb0d1 100644 --- a/iSolarCloud/WebIscmAppService/getCountryNew/data.go +++ b/iSolarCloud/WebIscmAppService/getCountryNew/data.go @@ -1,11 +1,12 @@ package getCountryNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getCountryNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getCountryNew/struct.go b/iSolarCloud/WebIscmAppService/getCountryNew/struct.go index 6b2ee8782..e87f41ae2 100644 --- a/iSolarCloud/WebIscmAppService/getCountryNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getCountryNew/struct.go @@ -5,9 +5,9 @@ package getCountryNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go index eea52a9a3..255c50f08 100644 --- a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go +++ b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go @@ -1,8 +1,8 @@ package getDefinitionIdByKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go index c071c4121..415c82e96 100644 --- a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go +++ b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go @@ -5,9 +5,9 @@ package getDefinitionIdByKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go index aea3be805..2409a305f 100644 --- a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go +++ b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go @@ -1,10 +1,11 @@ package getDeploymentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DeploymentTime"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"DeploymentTime"` DeploymentTime valueTypes.DateTime `json:"deploymentTime" PointId:"deployment_time" PointNameDateFormat:"DateTimeLayout"` Id valueTypes.String `json:"id"` @@ -37,7 +38,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go b/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go index 5a745e30d..0f2e3d7f1 100644 --- a/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go @@ -5,9 +5,9 @@ package getDeploymentList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go index 85be9e560..6c9727363 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go @@ -1,9 +1,9 @@ package getDeviceFactoryListByIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go index 7a320ada8..6401fd6eb 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go @@ -5,9 +5,9 @@ package getDeviceFactoryListByIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go index d9c4b7855..ad015a94f 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go @@ -1,10 +1,11 @@ package getDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -81,7 +82,7 @@ type ResultData struct { } `json:"sysTypeList" PointId:"sys_type_list" DataTable:"true" DataTableSortOn:"CodeValue"` AllFactoryList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointListFlatten:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointListFlatten:"true"` Id valueTypes.Integer `json:"id"` FactoryName valueTypes.String `json:"factory_name"` @@ -92,7 +93,7 @@ type ResultData struct { Remark valueTypes.String `json:"remark"` } `json:"all_factory_list" DataTable:"true" DataTableSortOn:"Id"` DeviceTypeList []struct { - GoStruct GoStruct.GoStruct `json:"-" PointListFlatten:"true"` + GoStruct GoStruct.GoStruct `json:"-" PointListFlatten:"true"` TypeId valueTypes.Integer `json:"type_id"` TypeCode valueTypes.Integer `json:"type_code"` diff --git a/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go index 5a8477afc..4772974c8 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go @@ -5,9 +5,9 @@ package getDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDevicePro/data.go b/iSolarCloud/WebIscmAppService/getDevicePro/data.go index 5fef40dbd..09d998157 100644 --- a/iSolarCloud/WebIscmAppService/getDevicePro/data.go +++ b/iSolarCloud/WebIscmAppService/getDevicePro/data.go @@ -1,8 +1,8 @@ package getDevicePro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getDevicePro/struct.go b/iSolarCloud/WebIscmAppService/getDevicePro/struct.go index 827ade203..090ff635a 100644 --- a/iSolarCloud/WebIscmAppService/getDevicePro/struct.go +++ b/iSolarCloud/WebIscmAppService/getDevicePro/struct.go @@ -5,9 +5,9 @@ package getDevicePro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go index c1686916f..4c0d9db65 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go @@ -1,11 +1,12 @@ package getDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getDeviceSubType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go index 2875208c5..f88e3c391 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go @@ -5,9 +5,9 @@ package getDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go index 0376135c4..d9f16b498 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go @@ -1,9 +1,9 @@ package getDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go index 30699751e..08bd40d06 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go @@ -5,9 +5,9 @@ package getDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceType/data.go b/iSolarCloud/WebIscmAppService/getDeviceType/data.go index 94e87cea0..2597cc80c 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceType/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceType/data.go @@ -1,9 +1,9 @@ package getDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getDeviceType/struct.go b/iSolarCloud/WebIscmAppService/getDeviceType/struct.go index 6b3fc8d17..74fc60199 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceType/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceType/struct.go @@ -5,9 +5,9 @@ package getDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go index 23fa6299e..4a587d774 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go +++ b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go @@ -1,9 +1,9 @@ package getDeviceTypeInfoById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.getDeviceTypeInfoById" type RequestData struct { - CodeType valueTypes.String `json:"code_type" required:"true"` + CodeType valueTypes.String `json:"code_type" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,17 +25,17 @@ func (rd RequestData) Help() string { return ret } -type ResultData struct { +type ResultData struct { PowerDeviceTypeMap struct { - UpdateDate valueTypes.DateTime `json:"update_date" PointNameDateFormat:"DateTimeLayout"` - 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"` - IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` - ValidFlag valueTypes.Bool `json:"valid_flag"` + UpdateDate valueTypes.DateTime `json:"update_date" PointNameDateFormat:"DateTimeLayout"` + 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"` + IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"` + ValidFlag valueTypes.Bool `json:"valid_flag"` } `json:"powerDeviceTypeMap" PointId:"power_device_type_map" DataTable:"true"` SysList []struct { CodeValue valueTypes.String `json:"code_value"` diff --git a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go index 215a8844e..2e82df455 100644 --- a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go +++ b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go @@ -5,9 +5,9 @@ package getDeviceTypeInfoById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getDutyUserList/data.go b/iSolarCloud/WebIscmAppService/getDutyUserList/data.go index 7f29acecc..1878b8c44 100644 --- a/iSolarCloud/WebIscmAppService/getDutyUserList/data.go +++ b/iSolarCloud/WebIscmAppService/getDutyUserList/data.go @@ -1,11 +1,12 @@ package getDutyUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getDutyUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go b/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go index f5ed7f3f8..1442ba83b 100644 --- a/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go +++ b/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go @@ -5,9 +5,9 @@ package getDutyUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go b/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go index 63c255fa0..336f7b301 100644 --- a/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go +++ b/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go @@ -1,11 +1,12 @@ package getFatherPrivileges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getFatherPrivileges" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go b/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go index e9cb0ea9a..d571742c6 100644 --- a/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go +++ b/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go @@ -5,9 +5,9 @@ package getFatherPrivileges import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go b/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go index 19d856e29..e1c0036ef 100644 --- a/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go +++ b/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go @@ -1,10 +1,11 @@ package getGroupManSettings import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go b/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go index 6833f8e50..f58e4a796 100644 --- a/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go +++ b/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go @@ -5,9 +5,9 @@ package getGroupManSettings import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go index 762ad8bd6..5d3e09cf1 100644 --- a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go +++ b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go @@ -1,11 +1,12 @@ package getGroupManSettingsMembers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getGroupManSettingsMembers" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go index 9b9348e2e..7e418c293 100644 --- a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go +++ b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go @@ -5,9 +5,9 @@ package getGroupManSettingsMembers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go b/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go index 5fb5da098..aae573abf 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go +++ b/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go @@ -1,11 +1,12 @@ package getMaterialByListId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getMaterialByListId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go b/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go index 2f9dc0ceb..57125c53c 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go +++ b/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go @@ -5,9 +5,9 @@ package getMaterialByListId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getMaterialByType/data.go b/iSolarCloud/WebIscmAppService/getMaterialByType/data.go index b3282bc20..2bc799440 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialByType/data.go +++ b/iSolarCloud/WebIscmAppService/getMaterialByType/data.go @@ -1,8 +1,8 @@ package getMaterialByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go b/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go index 05f7f9a77..1b540f16d 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go +++ b/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go @@ -5,9 +5,9 @@ package getMaterialByType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getMaterialList/data.go b/iSolarCloud/WebIscmAppService/getMaterialList/data.go index 425596192..4940078a2 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialList/data.go +++ b/iSolarCloud/WebIscmAppService/getMaterialList/data.go @@ -1,8 +1,8 @@ package getMaterialList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getMaterialList/struct.go b/iSolarCloud/WebIscmAppService/getMaterialList/struct.go index 6524f1c5f..3b28b40f9 100644 --- a/iSolarCloud/WebIscmAppService/getMaterialList/struct.go +++ b/iSolarCloud/WebIscmAppService/getMaterialList/struct.go @@ -5,9 +5,9 @@ package getMaterialList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go index 397688657..2ccd4730e 100644 --- a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go +++ b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go @@ -1,10 +1,11 @@ package getMaxDeviceIdByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.getMaxDeviceIdByPsId" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" required:"true"` + PsId valueTypes.PsId `json:"ps_id" required:"true"` } func (rd RequestData) IsValid() error { @@ -25,7 +26,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { MaxDeviceId valueTypes.Integer `json:"max_device_id"` } diff --git a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go index ab1464dd2..0f78702e9 100644 --- a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go +++ b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go @@ -5,9 +5,9 @@ package getMaxDeviceIdByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getModelPoints/data.go b/iSolarCloud/WebIscmAppService/getModelPoints/data.go index 3f74c1b56..6ec954dc3 100644 --- a/iSolarCloud/WebIscmAppService/getModelPoints/data.go +++ b/iSolarCloud/WebIscmAppService/getModelPoints/data.go @@ -1,10 +1,11 @@ package getModelPoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -26,7 +27,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PointId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PointId"` DeviceModelId valueTypes.Integer `json:"device_model_id"` PointId valueTypes.Integer `json:"point_id"` diff --git a/iSolarCloud/WebIscmAppService/getModelPoints/struct.go b/iSolarCloud/WebIscmAppService/getModelPoints/struct.go index a2aa37e23..24b3c4bbd 100644 --- a/iSolarCloud/WebIscmAppService/getModelPoints/struct.go +++ b/iSolarCloud/WebIscmAppService/getModelPoints/struct.go @@ -5,9 +5,9 @@ package getModelPoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go b/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go index bec7e228e..812186aca 100644 --- a/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go +++ b/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go @@ -1,10 +1,11 @@ package getMoneyUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` CodeId valueTypes.String `json:"code_id"` CodeName valueTypes.String `json:"code_name"` @@ -36,7 +37,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go b/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go index f12167d7f..b90ebb699 100644 --- a/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go +++ b/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go @@ -5,9 +5,9 @@ package getMoneyUnitList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getNamecnNew/data.go b/iSolarCloud/WebIscmAppService/getNamecnNew/data.go index 6241525f1..b98d85666 100644 --- a/iSolarCloud/WebIscmAppService/getNamecnNew/data.go +++ b/iSolarCloud/WebIscmAppService/getNamecnNew/data.go @@ -1,11 +1,12 @@ package getNamecnNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getNamecnNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go b/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go index 35c74cf4b..58c0f8fa1 100644 --- a/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go @@ -5,9 +5,9 @@ package getNamecnNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getNationList/data.go b/iSolarCloud/WebIscmAppService/getNationList/data.go index 0f7e6f497..9d358a40f 100644 --- a/iSolarCloud/WebIscmAppService/getNationList/data.go +++ b/iSolarCloud/WebIscmAppService/getNationList/data.go @@ -1,10 +1,11 @@ package getNationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -24,9 +25,8 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"NationCode"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"NationCode"` NationCode valueTypes.String `json:"nation_code"` Nation valueTypes.String `json:"nation"` @@ -37,7 +37,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getNationList/struct.go b/iSolarCloud/WebIscmAppService/getNationList/struct.go index 36f283eda..4d8a3aad4 100644 --- a/iSolarCloud/WebIscmAppService/getNationList/struct.go +++ b/iSolarCloud/WebIscmAppService/getNationList/struct.go @@ -5,9 +5,9 @@ package getNationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOperationRecord/data.go b/iSolarCloud/WebIscmAppService/getOperationRecord/data.go index 4adef5f55..fbd769b16 100644 --- a/iSolarCloud/WebIscmAppService/getOperationRecord/data.go +++ b/iSolarCloud/WebIscmAppService/getOperationRecord/data.go @@ -1,11 +1,12 @@ package getOperationRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getOperationRecord" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go b/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go index 7e90c48e1..845001e05 100644 --- a/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go +++ b/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go @@ -5,9 +5,9 @@ package getOperationRecord import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go index c9865c68b..72cb96d9f 100644 --- a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go @@ -1,11 +1,12 @@ package getOrgAndChildBasicInfoOptions import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgAndChildBasicInfoOptions" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go index c523cd312..309c44516 100644 --- a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go @@ -5,9 +5,9 @@ package getOrgAndChildBasicInfoOptions import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go index 8b5d87917..332a35a8c 100644 --- a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go @@ -1,11 +1,12 @@ package getOrgAndStateAndCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getOrgAndStateAndCode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go index 4d5ebc8db..9c93974f3 100644 --- a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go @@ -5,9 +5,9 @@ package getOrgAndStateAndCode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgForPs/data.go b/iSolarCloud/WebIscmAppService/getOrgForPs/data.go index 12cfd3e32..02a5d0e8d 100644 --- a/iSolarCloud/WebIscmAppService/getOrgForPs/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgForPs/data.go @@ -1,11 +1,12 @@ package getOrgForPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getOrgForPs" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go b/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go index 48845662c..6bb6aefbc 100644 --- a/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go @@ -5,9 +5,9 @@ package getOrgForPs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgList/data.go b/iSolarCloud/WebIscmAppService/getOrgList/data.go index 516bc7bd6..5e4564efd 100644 --- a/iSolarCloud/WebIscmAppService/getOrgList/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgList/data.go @@ -1,10 +1,11 @@ package getOrgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"OrgId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"OrgId"` OrgId valueTypes.Integer `json:"org_id"` OrgName valueTypes.String `json:"org_name"` diff --git a/iSolarCloud/WebIscmAppService/getOrgList/struct.go b/iSolarCloud/WebIscmAppService/getOrgList/struct.go index bd24b2524..6b3b463c8 100644 --- a/iSolarCloud/WebIscmAppService/getOrgList/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgList/struct.go @@ -5,9 +5,9 @@ package getOrgList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go b/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go index 4476cb4b9..0c12ec683 100644 --- a/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go @@ -1,11 +1,12 @@ package getOrgListForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgListForUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go b/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go index cfdbe7b3d..756e6e684 100644 --- a/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go @@ -5,9 +5,9 @@ package getOrgListForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go index ca322ff6d..d42e32ad2 100644 --- a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go @@ -1,11 +1,12 @@ package getOrgNodeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgNodeInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go index 178f3a3f4..e2162264b 100644 --- a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go @@ -5,9 +5,9 @@ package getOrgNodeInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgStationList/data.go b/iSolarCloud/WebIscmAppService/getOrgStationList/data.go index f124c987e..0d64a4a9d 100644 --- a/iSolarCloud/WebIscmAppService/getOrgStationList/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgStationList/data.go @@ -1,10 +1,11 @@ package getOrgStationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go b/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go index e20e86040..346c198aa 100644 --- a/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go @@ -5,9 +5,9 @@ package getOrgStationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go index 597418806..eeaf8f046 100644 --- a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go @@ -1,11 +1,12 @@ package getOrgStationListByPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgStationListByPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go index 3f6e3d54b..9e9f931ce 100644 --- a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go @@ -5,9 +5,9 @@ package getOrgStationListByPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgUserList/data.go b/iSolarCloud/WebIscmAppService/getOrgUserList/data.go index 98fee9665..2dda12e3d 100644 --- a/iSolarCloud/WebIscmAppService/getOrgUserList/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgUserList/data.go @@ -1,11 +1,12 @@ package getOrgUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getOrgUserList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go b/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go index 3a6bebe5d..badaddbfe 100644 --- a/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go @@ -5,9 +5,9 @@ package getOrgUserList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go b/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go index ba18048ee..bc3c52e50 100644 --- a/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go @@ -1,10 +1,11 @@ package getOrgUserMapData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go b/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go index 9d8a0802d..e0f046aa7 100644 --- a/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go @@ -5,9 +5,9 @@ package getOrgUserMapData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree/data.go b/iSolarCloud/WebIscmAppService/getOrgZtree/data.go index 7f5e23793..fc420d549 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtree/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtree/data.go @@ -1,11 +1,12 @@ package getOrgZtree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgZtree" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go index dfc58ccd3..8b2144703 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go @@ -5,9 +5,9 @@ package getOrgZtree import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go b/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go index f055329b0..5b7b628a7 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go @@ -1,11 +1,12 @@ package getOrgZtree4User import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgZtree4User" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go index df583fffe..29fbdf170 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go @@ -5,9 +5,9 @@ package getOrgZtree4User import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go index 971ebe58d..ded892f09 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go @@ -1,11 +1,12 @@ package getOrgZtreeAsync import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgZtreeAsync" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go index 097dd9eed..4865cdbef 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go @@ -5,9 +5,9 @@ package getOrgZtreeAsync import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go index 63de30d07..6ec0be553 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go @@ -1,11 +1,12 @@ package getOrgZtreeForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getOrgZtreeForUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go index e7aee7e9f..b01442146 100644 --- a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go +++ b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go @@ -5,9 +5,9 @@ package getOrgZtreeForUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPictureList/data.go b/iSolarCloud/WebIscmAppService/getPictureList/data.go index 1a35be659..025e1d429 100644 --- a/iSolarCloud/WebIscmAppService/getPictureList/data.go +++ b/iSolarCloud/WebIscmAppService/getPictureList/data.go @@ -1,11 +1,12 @@ package getPictureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/getPictureList" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getPictureList/struct.go b/iSolarCloud/WebIscmAppService/getPictureList/struct.go index 6fe7fb4ee..9facd98e9 100644 --- a/iSolarCloud/WebIscmAppService/getPictureList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPictureList/struct.go @@ -5,9 +5,9 @@ package getPictureList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPointInfo/data.go b/iSolarCloud/WebIscmAppService/getPointInfo/data.go index 80ed3a384..7de860eae 100644 --- a/iSolarCloud/WebIscmAppService/getPointInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getPointInfo/data.go @@ -1,10 +1,11 @@ package getPointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPointInfo" diff --git a/iSolarCloud/WebIscmAppService/getPointInfo/struct.go b/iSolarCloud/WebIscmAppService/getPointInfo/struct.go index 944506e14..5746d87e1 100644 --- a/iSolarCloud/WebIscmAppService/getPointInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getPointInfo/struct.go @@ -5,9 +5,9 @@ package getPointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go b/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go index ddcfadf65..2966937cd 100644 --- a/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go +++ b/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go @@ -1,10 +1,11 @@ package getPointInfoPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPointInfoPage" diff --git a/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go b/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go index f6ae0cc7c..5d25386f7 100644 --- a/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go +++ b/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go @@ -5,9 +5,9 @@ package getPointInfoPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go index 11e67cf99..4717bfa61 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go @@ -1,10 +1,11 @@ package getPowerDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go b/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go index 6ce039e96..ab8668d7b 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go @@ -5,9 +5,9 @@ package getPowerDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go index 5c725cad7..78a3c245e 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go @@ -1,10 +1,11 @@ package getPowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPowerDeviceChannl" diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go index 3fe1cb653..ca5fff654 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go index bccc118e4..e57e8a2bd 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go @@ -1,10 +1,11 @@ package getPowerDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/getPowerDeviceFactory" @@ -23,7 +24,7 @@ func (rd RequestData) Help() string { return ret } -type ResultData struct { +type ResultData struct { IndustryList []struct { CodeValue valueTypes.String `json:"code_value"` CodeName valueTypes.String `json:"code_name"` diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go index 06a7d71c8..62b5d1053 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go index d9e400400..612a767f2 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go @@ -1,9 +1,9 @@ package getPowerDeviceFactoryListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -24,8 +24,7 @@ func (rd RequestData) Help() string { return ret } - -type ResultData struct { +type ResultData struct { Count valueTypes.Integer `json:"count"` } diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go index 20a7fb653..fbdc967bc 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceFactoryListCount import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go index ab069a031..fdf68ff48 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go @@ -1,9 +1,9 @@ package getPowerDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,7 +13,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.getPowerDeviceInfo" type RequestData struct { - Uuid valueTypes.String `json:"uuid" required:"true"` + Uuid valueTypes.String `json:"uuid" required:"true"` DeviceType valueTypes.Integer `json:"device_type" required:"true"` } diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go index dc4e5c5b4..bf659becd 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go index cd2d76c70..7c2d3deff 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go @@ -1,16 +1,18 @@ package getPowerDeviceModelList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getPowerDeviceModelList" const Disabled = false const EndPointName = "WebIscmAppService.getPowerDeviceModelList" + // ./gojson.sh WebIscmAppService.getPowerDeviceModelList '{"device_type":"44"}' type RequestData struct { @@ -27,7 +29,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"ModelId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"ModelId"` ModelId valueTypes.Integer `json:"model_id"` InverterModelType valueTypes.Integer `json:"inverter_model_type"` @@ -44,7 +46,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go index 8ddb668ae..72a597401 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceModelList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go index 45ae6ae6f..a80bfaebb 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go @@ -1,9 +1,9 @@ package getPowerDeviceModelTechList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -26,8 +26,8 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` // PointIdFrom:"CodeId" PointIdReplace:"true"` - GoStruct GoStruct.GoStruct `json:"-"` // PointIdFrom:"CodeId" PointIdReplace:"true"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` // PointIdFrom:"CodeId" PointIdReplace:"true"` + GoStruct GoStruct.GoStruct `json:"-"` // PointIdFrom:"CodeId" PointIdReplace:"true"` CodeId valueTypes.Integer `json:"code_id"` CodeValue valueTypes.String `json:"code_value"` diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go index 9ebd739ba..4e051ed69 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceModelTechList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go index c8e08612a..2277c0a27 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go @@ -1,14 +1,14 @@ package getPowerDeviceTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) - const Url = "/v1/devService/getPowerDeviceTypeList" const Disabled = false const EndPointName = "WebIscmAppService.getPowerDeviceTypeList" @@ -26,17 +26,17 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"GoStruct" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"UpdateDate"` - - UpdateDate valueTypes.DateTime `json:"update_date" PointNameDateFormat:"DateTimeLayout"` - 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"` + GoStructParent GoStruct.GoStructParent `json:"GoStruct" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"UpdateDate"` + + UpdateDate valueTypes.DateTime `json:"update_date" PointNameDateFormat:"DateTimeLayout"` + 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 { diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go index 2207f6869..961262391 100644 --- a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go @@ -5,9 +5,9 @@ package getPowerDeviceTypeList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go b/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go index 3cc2d500d..8d9150cf9 100644 --- a/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go @@ -1,10 +1,11 @@ package getPowerPlanList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPowerPlanList" @@ -24,9 +25,9 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` - PsId valueTypes.Float `json:"ps_id"` + PsId valueTypes.Float `json:"ps_id"` January valueTypes.Float `json:"one" PointId:"january"` February valueTypes.Float `json:"two" PointId:"february"` diff --git a/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go b/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go index cbb05789f..025c82f9d 100644 --- a/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go @@ -5,9 +5,9 @@ package getPowerPlanList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerStation/data.go b/iSolarCloud/WebIscmAppService/getPowerStation/data.go index 9e0d31886..fe7a4a8f0 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStation/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerStation/data.go @@ -1,10 +1,11 @@ package getPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getPowerStation/struct.go b/iSolarCloud/WebIscmAppService/getPowerStation/struct.go index 9430087dc..b8ffa2cd2 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStation/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerStation/struct.go @@ -5,9 +5,9 @@ package getPowerStation import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go index 24d155b4c..263ee9b99 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go @@ -1,11 +1,12 @@ package getPowerStationInfo import ( - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/powerStationService/getPowerStationInfoForBackSys" @@ -14,7 +15,7 @@ const EndPointName = "WebIscmAppService.getPowerStationInfo" type RequestData struct { // @TODO - Fixup this up for iSolarCloud/data_request.go - PsId2 valueTypes.PsId `json:"psId" require:"true"` + PsId2 valueTypes.PsId `json:"psId" require:"true"` } func (rd RequestData) IsValid() error { @@ -32,8 +33,8 @@ type ResultData struct { PsList []struct { // GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"PsId" PointIdReplace:"true" PointDeviceFrom:"PsId"` - PsId valueTypes.PsId `json:"ps_id"` - PsType valueTypes.Integer `json:"ps_type"` + PsId valueTypes.PsId `json:"ps_id"` + PsType valueTypes.Integer `json:"ps_type"` BatteryPlateArea Common.Unknown `json:"battery_plate_area"` BatteryType valueTypes.Integer `json:"battery_type"` @@ -76,8 +77,8 @@ type ResultData struct { } `json:"psList" PointId:"ps_list"` PsMap struct { - PsId valueTypes.PsId `json:"psid" PointId:"ps_id"` - PsType valueTypes.Integer `json:"pstype" PointId:"ps_type"` + PsId valueTypes.PsId `json:"psid" PointId:"ps_id"` + PsType valueTypes.Integer `json:"pstype" PointId:"ps_type"` AccessType Common.Unknown `json:"access_type"` AreaType Common.Unknown `json:"area_type"` diff --git a/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go b/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go index 828564c00..bd0349420 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go @@ -5,9 +5,9 @@ package getPowerStationInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerStationList/data.go b/iSolarCloud/WebIscmAppService/getPowerStationList/data.go index f5bd93dbe..890f3207f 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStationList/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerStationList/data.go @@ -1,9 +1,9 @@ package getPowerStationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -25,7 +25,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PsId"` PsId valueTypes.PsId `json:"ps_id"` PsName valueTypes.String `json:"ps_name"` diff --git a/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go b/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go index 02d38d971..384573b42 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go @@ -5,9 +5,9 @@ package getPowerStationList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPowerStore/data.go b/iSolarCloud/WebIscmAppService/getPowerStore/data.go index b611830ca..5a803df45 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStore/data.go +++ b/iSolarCloud/WebIscmAppService/getPowerStore/data.go @@ -1,8 +1,8 @@ package getPowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getPowerStore/struct.go b/iSolarCloud/WebIscmAppService/getPowerStore/struct.go index 03fe2a7b0..859a77ea1 100644 --- a/iSolarCloud/WebIscmAppService/getPowerStore/struct.go +++ b/iSolarCloud/WebIscmAppService/getPowerStore/struct.go @@ -5,9 +5,9 @@ package getPowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getProvcnNew/data.go b/iSolarCloud/WebIscmAppService/getProvcnNew/data.go index e753b9d63..2eada7cad 100644 --- a/iSolarCloud/WebIscmAppService/getProvcnNew/data.go +++ b/iSolarCloud/WebIscmAppService/getProvcnNew/data.go @@ -1,8 +1,8 @@ package getProvcnNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go b/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go index 8fbc822cd..63d5734e9 100644 --- a/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go @@ -5,9 +5,9 @@ package getProvcnNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go b/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go index a50430cc0..968fd3a82 100644 --- a/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go @@ -1,9 +1,9 @@ package getPsTreeMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go b/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go index eedddc450..718aae997 100644 --- a/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go @@ -5,9 +5,9 @@ package getPsTreeMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go b/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go index 88986588a..c60787b83 100644 --- a/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go +++ b/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go @@ -1,11 +1,12 @@ package getRoleByUserIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getRoleByUserIds" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go b/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go index a380cce89..24080604f 100644 --- a/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go +++ b/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go @@ -5,9 +5,9 @@ package getRoleByUserIds import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go index 5e22b1f69..7f893d48a 100644 --- a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go +++ b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go @@ -1,11 +1,12 @@ package getRootOrgInfoByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getRootOrgInfoByUserId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go index 095cd5697..2ce1e7a2c 100644 --- a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go +++ b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go @@ -5,9 +5,9 @@ package getRootOrgInfoByUserId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go b/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go index 0bab32040..c334806cf 100644 --- a/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go +++ b/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go @@ -1,11 +1,12 @@ package getSettingUserMapData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/getSettingUserMapData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go b/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go index 9322454db..29bd93306 100644 --- a/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go +++ b/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go @@ -5,9 +5,9 @@ package getSettingUserMapData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getStateNew/data.go b/iSolarCloud/WebIscmAppService/getStateNew/data.go index 6780776bb..65151962b 100644 --- a/iSolarCloud/WebIscmAppService/getStateNew/data.go +++ b/iSolarCloud/WebIscmAppService/getStateNew/data.go @@ -1,11 +1,12 @@ package getStateNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getStateNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getStateNew/struct.go b/iSolarCloud/WebIscmAppService/getStateNew/struct.go index 1dbec8fda..609705abd 100644 --- a/iSolarCloud/WebIscmAppService/getStateNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getStateNew/struct.go @@ -5,9 +5,9 @@ package getStateNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go b/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go index b5c992594..a3e629fe7 100644 --- a/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go +++ b/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go @@ -1,11 +1,12 @@ package getSubTypeDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getSubTypeDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go b/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go index 6387f9c72..00e780e3f 100644 --- a/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go @@ -5,9 +5,9 @@ package getSubTypeDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go b/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go index 244f6a413..49c577295 100644 --- a/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go +++ b/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go @@ -1,9 +1,9 @@ package getSysHomeList2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go b/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go index 29c91c5bd..d59214546 100644 --- a/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go +++ b/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go @@ -5,9 +5,9 @@ package getSysHomeList2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSysMenu/data.go b/iSolarCloud/WebIscmAppService/getSysMenu/data.go index 814d2184a..4a733f585 100644 --- a/iSolarCloud/WebIscmAppService/getSysMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getSysMenu/data.go @@ -1,9 +1,9 @@ package getSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -26,30 +26,30 @@ func (rd RequestData) Help() string { } type ResultData struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"` - MenuId valueTypes.Integer `json:"menuid" PointId:"menu_id"` - MenuLevel valueTypes.Integer `json:"menulevel" PointId:"menu_level"` - MenuName valueTypes.String `json:"menuname" PointId:"menu_name"` - MenuOrder valueTypes.Integer `json:"menuorder" PointId:"menu_order"` - MenuType valueTypes.String `json:"menutype" PointId:"menu_type"` - MenuUrl valueTypes.String `json:"menuurl" PointId:"menu_url"` - MenuCode valueTypes.String `json:"menucode" PointId:"menu_code"` - MenuDesc valueTypes.String `json:"menudesc" PointId:"menu_desc"` - MenuValidFlag valueTypes.Bool `json:"menuvalidflag" PointId:"menu_valid_flag"` - IsThirdPlatform valueTypes.Bool `json:"isthirdplatform" PointId:"is_third_platform"` - OpenType valueTypes.String `json:"opentype" PointId:"open_type"` - UrlTarget valueTypes.String `json:"urltarget" PointId:"url_target"` - FatherMenu valueTypes.String `json:"fathermenu" PointId:"father_menu"` - FatherMenuId valueTypes.Integer `json:"fathermenuid" PointId:"father_menu_id"` - Belongs interface{} `json:"belongs" PointId:"belongs"` - IconFileId interface{} `json:"iconfileid" PointId:"iconfile_id"` - IconUrl interface{} `json:"iconurl" PointId:"icon_url"` - IsOpen interface{} `json:"isopen" PointId:"is_open"` - PrivilegeCodeStr interface{} `json:"privilegecodestr" PointId:"privilege_code_str"` - ReportId interface{} `json:"report_id" PointId:"report_id"` - VueIcon interface{} `json:"vueIcon" PointId:"vue_icon"` - VuePath interface{} `json:"vuePath" PointId:"vue_path"` + MenuId valueTypes.Integer `json:"menuid" PointId:"menu_id"` + MenuLevel valueTypes.Integer `json:"menulevel" PointId:"menu_level"` + MenuName valueTypes.String `json:"menuname" PointId:"menu_name"` + MenuOrder valueTypes.Integer `json:"menuorder" PointId:"menu_order"` + MenuType valueTypes.String `json:"menutype" PointId:"menu_type"` + MenuUrl valueTypes.String `json:"menuurl" PointId:"menu_url"` + MenuCode valueTypes.String `json:"menucode" PointId:"menu_code"` + MenuDesc valueTypes.String `json:"menudesc" PointId:"menu_desc"` + MenuValidFlag valueTypes.Bool `json:"menuvalidflag" PointId:"menu_valid_flag"` + IsThirdPlatform valueTypes.Bool `json:"isthirdplatform" PointId:"is_third_platform"` + OpenType valueTypes.String `json:"opentype" PointId:"open_type"` + UrlTarget valueTypes.String `json:"urltarget" PointId:"url_target"` + FatherMenu valueTypes.String `json:"fathermenu" PointId:"father_menu"` + FatherMenuId valueTypes.Integer `json:"fathermenuid" PointId:"father_menu_id"` + Belongs interface{} `json:"belongs" PointId:"belongs"` + IconFileId interface{} `json:"iconfileid" PointId:"iconfile_id"` + IconUrl interface{} `json:"iconurl" PointId:"icon_url"` + IsOpen interface{} `json:"isopen" PointId:"is_open"` + PrivilegeCodeStr interface{} `json:"privilegecodestr" PointId:"privilege_code_str"` + ReportId interface{} `json:"report_id" PointId:"report_id"` + VueIcon interface{} `json:"vueIcon" PointId:"vue_icon"` + VuePath interface{} `json:"vuePath" PointId:"vue_path"` } func (e *ResultData) IsValid() error { diff --git a/iSolarCloud/WebIscmAppService/getSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getSysMenu/struct.go index f4ebd8285..87fe3ab21 100644 --- a/iSolarCloud/WebIscmAppService/getSysMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getSysMenu/struct.go @@ -5,9 +5,9 @@ package getSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go b/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go index c353c1870..69c7cd4cf 100644 --- a/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go +++ b/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go @@ -1,8 +1,8 @@ package getSysOrgPro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go b/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go index a4aedb8b7..80b28031d 100644 --- a/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go +++ b/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go @@ -5,9 +5,9 @@ package getSysOrgPro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSysUser/data.go b/iSolarCloud/WebIscmAppService/getSysUser/data.go index b54d5db8c..645821faf 100644 --- a/iSolarCloud/WebIscmAppService/getSysUser/data.go +++ b/iSolarCloud/WebIscmAppService/getSysUser/data.go @@ -1,10 +1,11 @@ package getSysUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getSysUser/struct.go b/iSolarCloud/WebIscmAppService/getSysUser/struct.go index 617a1dc26..37fc89b11 100644 --- a/iSolarCloud/WebIscmAppService/getSysUser/struct.go +++ b/iSolarCloud/WebIscmAppService/getSysUser/struct.go @@ -5,9 +5,9 @@ package getSysUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go index cd62999d1..479425cea 100644 --- a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go @@ -1,11 +1,12 @@ package getSystemOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getSystemOrgInfo" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go index b00cdecfd..c591fe696 100644 --- a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go @@ -5,9 +5,9 @@ package getSystemOrgInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go index 689136d9f..b7a7e8cc5 100644 --- a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go +++ b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go @@ -1,8 +1,8 @@ package getSystemRoleInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" ) diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go index 4697468bb..2e44989b6 100644 --- a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go @@ -5,9 +5,9 @@ package getSystemRoleInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go b/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go index 7936f2bbe..8e644dd12 100644 --- a/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go +++ b/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go @@ -1,11 +1,12 @@ package getSystemRoleList2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getSystemRoleList2" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go b/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go index bbf5bb483..92d626904 100644 --- a/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go +++ b/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go @@ -5,9 +5,9 @@ package getSystemRoleList2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getTownValueNew/data.go b/iSolarCloud/WebIscmAppService/getTownValueNew/data.go index 440f15738..ca67fb5d1 100644 --- a/iSolarCloud/WebIscmAppService/getTownValueNew/data.go +++ b/iSolarCloud/WebIscmAppService/getTownValueNew/data.go @@ -1,11 +1,12 @@ package getTownValueNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getTownValueNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go b/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go index 4529cf3da..1acdfa2cc 100644 --- a/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go @@ -5,9 +5,9 @@ package getTownValueNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go b/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go index b53256c17..89d3da03f 100644 --- a/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go +++ b/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go @@ -1,9 +1,9 @@ package getUserMenuLs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -15,6 +15,7 @@ const EndPointName = "WebIscmAppService.getUserMenuLs" type RequestData struct { UserId valueTypes.String `json:"userId" required:"true"` } + func (rd RequestData) IsValid() error { return GoStruct.VerifyOptionsRequired(rd) } @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"MenuId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"MenuId"` // GoStruct GoStruct.GoStruct `json:"-" PointIdFrom:"MenuId" PointIdReplace:"false"` MenuId valueTypes.Integer `json:"menuid" PointId:"menu_id"` diff --git a/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go b/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go index 239d06f22..245d0dc67 100644 --- a/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go +++ b/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go @@ -5,9 +5,9 @@ package getUserMenuLs import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go b/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go index 803de468f..98944f9c6 100644 --- a/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go +++ b/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go @@ -1,11 +1,12 @@ package getUserOrgPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/getUserOrgPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go b/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go index e784bfb28..0fbec3250 100644 --- a/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go +++ b/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go @@ -5,9 +5,9 @@ package getUserOrgPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getVillageList/data.go b/iSolarCloud/WebIscmAppService/getVillageList/data.go index 187118bde..781453cfd 100644 --- a/iSolarCloud/WebIscmAppService/getVillageList/data.go +++ b/iSolarCloud/WebIscmAppService/getVillageList/data.go @@ -1,9 +1,10 @@ package getVillageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "github.com/MickMake/GoUnify/Only" ) @@ -23,9 +24,8 @@ func (rd RequestData) Help() string { return ret } - type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"VillageCode"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"VillageCode"` VillageCode string `json:"village_code"` Village string `json:"village"` @@ -36,7 +36,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/getVillageList/struct.go b/iSolarCloud/WebIscmAppService/getVillageList/struct.go index 30e83c512..b52cf7ff1 100644 --- a/iSolarCloud/WebIscmAppService/getVillageList/struct.go +++ b/iSolarCloud/WebIscmAppService/getVillageList/struct.go @@ -5,9 +5,9 @@ package getVillageList import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getVillageListNew/data.go b/iSolarCloud/WebIscmAppService/getVillageListNew/data.go index e62a1219b..44b8c6e56 100644 --- a/iSolarCloud/WebIscmAppService/getVillageListNew/data.go +++ b/iSolarCloud/WebIscmAppService/getVillageListNew/data.go @@ -1,11 +1,12 @@ package getVillageListNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/commonService/getVillageListNew" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go b/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go index 60e90a425..40eb7d467 100644 --- a/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go +++ b/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go @@ -5,9 +5,9 @@ package getVillageListNew import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go index c85484ec4..7cbc354e9 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go @@ -1,11 +1,12 @@ package getZtreeAsyncSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getZtreeAsyncSysMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go index 8e288b4a3..6466e843b 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go @@ -5,9 +5,9 @@ package getZtreeAsyncSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go index 4d87c487f..a9f5a226f 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go @@ -1,11 +1,12 @@ package getZtreeChildMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/getZtreeChildMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go index d3755d290..a55267513 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go @@ -5,9 +5,9 @@ package getZtreeChildMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go index f1fbe2d75..0789362f1 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go @@ -1,10 +1,11 @@ package getZtreeMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go index 6aabaa5db..dc61237d0 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go @@ -5,9 +5,9 @@ package getZtreeMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go index e9b7a9765..26de68ad4 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go +++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go @@ -1,11 +1,12 @@ package getZtreeSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getZtreeSysMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go index 4f256fbce..fb732019f 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go @@ -5,9 +5,9 @@ package getZtreeSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go index cf777588f..3cb76795f 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go +++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go @@ -1,11 +1,12 @@ package getZtreeSysMenu2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/getZtreeSysMenu2" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go index 3d545e824..6dd93f472 100644 --- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go +++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go @@ -5,9 +5,9 @@ package getZtreeSysMenu2 import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go index 50e64932c..9f33e04ad 100644 --- a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go +++ b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go @@ -1,11 +1,12 @@ package goToDevicePropertyPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/goToDevicePropertyPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go index 246be5c4c..5c7c4672f 100644 --- a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go +++ b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go @@ -5,9 +5,9 @@ package goToDevicePropertyPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/isCanAddUser/data.go b/iSolarCloud/WebIscmAppService/isCanAddUser/data.go index b3c4fe41b..dea3b464a 100644 --- a/iSolarCloud/WebIscmAppService/isCanAddUser/data.go +++ b/iSolarCloud/WebIscmAppService/isCanAddUser/data.go @@ -1,11 +1,12 @@ package isCanAddUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/isCanAddUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go b/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go index 601b84fe0..74726f646 100644 --- a/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go +++ b/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go @@ -5,9 +5,9 @@ package isCanAddUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go b/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go index f76978310..de81875fb 100644 --- a/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go +++ b/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go @@ -1,11 +1,12 @@ package isHasIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/isHasIrradiationData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go index ee82ddb97..749ed8a30 100644 --- a/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go +++ b/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go @@ -5,9 +5,9 @@ package isHasIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/isHasPlan/data.go b/iSolarCloud/WebIscmAppService/isHasPlan/data.go index 3ff4efdb7..bad70403e 100644 --- a/iSolarCloud/WebIscmAppService/isHasPlan/data.go +++ b/iSolarCloud/WebIscmAppService/isHasPlan/data.go @@ -1,11 +1,12 @@ package isHasPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/isHasPlan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/isHasPlan/struct.go b/iSolarCloud/WebIscmAppService/isHasPlan/struct.go index 74c1541d3..22077ae26 100644 --- a/iSolarCloud/WebIscmAppService/isHasPlan/struct.go +++ b/iSolarCloud/WebIscmAppService/isHasPlan/struct.go @@ -5,9 +5,9 @@ package isHasPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/loadDevice/data.go b/iSolarCloud/WebIscmAppService/loadDevice/data.go index 280a0b879..fb9f8693f 100644 --- a/iSolarCloud/WebIscmAppService/loadDevice/data.go +++ b/iSolarCloud/WebIscmAppService/loadDevice/data.go @@ -1,11 +1,12 @@ package loadDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/loadDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/loadDevice/struct.go b/iSolarCloud/WebIscmAppService/loadDevice/struct.go index b5cc2108b..d8b51bf17 100644 --- a/iSolarCloud/WebIscmAppService/loadDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/loadDevice/struct.go @@ -5,9 +5,9 @@ package loadDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modelPointsPage/data.go b/iSolarCloud/WebIscmAppService/modelPointsPage/data.go index 0a2e92658..e6ecc4c41 100644 --- a/iSolarCloud/WebIscmAppService/modelPointsPage/data.go +++ b/iSolarCloud/WebIscmAppService/modelPointsPage/data.go @@ -1,10 +1,11 @@ package modelPointsPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" ) const Url = "/v1/devService/modelPointsPage" @@ -12,7 +13,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.modelPointsPage" type RequestData struct { - DeviceModelId valueTypes.String `json:"device_model_id" required:"true"` + DeviceModelId valueTypes.String `json:"device_model_id" required:"true"` DeviceType valueTypes.Integer `json:"device_type" required:"true"` } @@ -27,7 +28,7 @@ func (rd RequestData) Help() string { type ResultData struct { PointList []struct { - GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PointId" PointIdReplace:"false"` + GoStructParent GoStruct.GoStructParent `json:"-" PointIdFromChild:"PointId" PointIdReplace:"false"` PointId valueTypes.Integer `json:"point_id"` PointName valueTypes.String `json:"point_name"` @@ -38,7 +39,7 @@ type ResultData struct { OrderNum valueTypes.Integer `json:"order_num"` } `json:"pointList" PointId:"point_list" DataTable:"true" DataTableSortOn:"PointId"` ModelList []struct { - GoStruct GoStruct.GoStructParent `json:"GoStruct" PointIdFromChild:"DeviceModelId" PointIdReplace:"false"` + GoStruct GoStruct.GoStructParent `json:"GoStruct" PointIdFromChild:"DeviceModelId" PointIdReplace:"false"` DeviceModelId valueTypes.Integer `json:"device_model_id"` DeviceModel valueTypes.String `json:"device_model"` diff --git a/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go b/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go index 2c042d0e5..88c57672f 100644 --- a/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go +++ b/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go @@ -5,9 +5,9 @@ package modelPointsPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -389,8 +383,8 @@ func (e EndPoint) GetEndPointDataTables() output.Tables { func (e EndPoint) ResultDataRef() ResultData { return e.Response.ResultData } + // IsDebug - Are we in debug mode? func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifyDevice/data.go b/iSolarCloud/WebIscmAppService/modifyDevice/data.go index 48aef6a68..87db4968a 100644 --- a/iSolarCloud/WebIscmAppService/modifyDevice/data.go +++ b/iSolarCloud/WebIscmAppService/modifyDevice/data.go @@ -1,11 +1,12 @@ package modifyDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/modifyDevicePre" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifyDevice/struct.go b/iSolarCloud/WebIscmAppService/modifyDevice/struct.go index 6542885b0..215e867d4 100644 --- a/iSolarCloud/WebIscmAppService/modifyDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/modifyDevice/struct.go @@ -5,9 +5,9 @@ package modifyDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go index ed04850e6..20b10eb9e 100644 --- a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go +++ b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go @@ -1,11 +1,12 @@ package modifyPowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/modifyPowerDeviceChannl" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go index 84c0a400c..2edbe3e97 100644 --- a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go +++ b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go @@ -5,9 +5,9 @@ package modifyPowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifySysOrg/data.go b/iSolarCloud/WebIscmAppService/modifySysOrg/data.go index 745e29ade..7db251869 100644 --- a/iSolarCloud/WebIscmAppService/modifySysOrg/data.go +++ b/iSolarCloud/WebIscmAppService/modifySysOrg/data.go @@ -1,11 +1,12 @@ package modifySysOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/modifySysOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go b/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go index 37187cc63..4f6275842 100644 --- a/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go +++ b/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go @@ -5,9 +5,9 @@ package modifySysOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go b/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go index 83fdb2207..c24b73333 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go +++ b/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go @@ -1,11 +1,12 @@ package modifySystemMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifySystemMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go b/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go index 432bfde5f..b77020b02 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go @@ -5,9 +5,9 @@ package modifySystemMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go index 548ce3f43..761e31abd 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go +++ b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go @@ -1,11 +1,12 @@ package modifySystemOrgNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/modifySystemOrgNode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go index 9baf33e32..41792fb61 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go +++ b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go @@ -5,9 +5,9 @@ package modifySystemOrgNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifySystemRole/data.go b/iSolarCloud/WebIscmAppService/modifySystemRole/data.go index 3006ef8b4..b8eb64950 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemRole/data.go +++ b/iSolarCloud/WebIscmAppService/modifySystemRole/data.go @@ -1,11 +1,12 @@ package modifySystemRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifySystemRole" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go b/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go index f899e43b2..407fffe82 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go +++ b/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go @@ -5,9 +5,9 @@ package modifySystemRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/modifySystemUser/data.go b/iSolarCloud/WebIscmAppService/modifySystemUser/data.go index 0d4ddd42a..634684aaa 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemUser/data.go +++ b/iSolarCloud/WebIscmAppService/modifySystemUser/data.go @@ -1,11 +1,12 @@ package modifySystemUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/modifySystemUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go b/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go index 90dfe8fe4..de31450e3 100644 --- a/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go +++ b/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go @@ -5,9 +5,9 @@ package modifySystemUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/publishNotice/data.go b/iSolarCloud/WebIscmAppService/publishNotice/data.go index 957b71fdd..86bc6fdc3 100644 --- a/iSolarCloud/WebIscmAppService/publishNotice/data.go +++ b/iSolarCloud/WebIscmAppService/publishNotice/data.go @@ -1,11 +1,12 @@ package publishNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/publishNotice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/publishNotice/struct.go b/iSolarCloud/WebIscmAppService/publishNotice/struct.go index 16cb6bea1..6a2268cda 100644 --- a/iSolarCloud/WebIscmAppService/publishNotice/struct.go +++ b/iSolarCloud/WebIscmAppService/publishNotice/struct.go @@ -5,9 +5,9 @@ package publishNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go b/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go index 105912764..02af016f0 100644 --- a/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go +++ b/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go @@ -1,10 +1,11 @@ package queryDeviceListForBackSys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -13,7 +14,7 @@ const Disabled = false const EndPointName = "WebIscmAppService.queryDeviceListForBackSys" type RequestData struct { - PsId valueTypes.PsId `json:"ps_id" require:"true"` + PsId valueTypes.PsId `json:"ps_id" require:"true"` } func (rd RequestData) IsValid() error { @@ -28,9 +29,9 @@ func (rd RequestData) Help() string { type ResultData []Device type Device struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"UUID"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"UUID"` - UUID valueTypes.Integer `json:"uuid"` + UUID valueTypes.Integer `json:"uuid"` DeviceCode valueTypes.Integer `json:"device_code"` DeviceType valueTypes.Integer `json:"device_type"` diff --git a/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/struct.go b/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/struct.go index 048b7fc34..bdf2b60bb 100644 --- a/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/struct.go +++ b/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/struct.go @@ -5,9 +5,9 @@ package queryDeviceListForBackSys import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/queryDutyType/data.go b/iSolarCloud/WebIscmAppService/queryDutyType/data.go index fb76470bf..b4bc3c824 100644 --- a/iSolarCloud/WebIscmAppService/queryDutyType/data.go +++ b/iSolarCloud/WebIscmAppService/queryDutyType/data.go @@ -1,10 +1,11 @@ package queryDutyType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) @@ -25,7 +26,7 @@ func (rd RequestData) Help() string { } type ResultData []struct { - GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` + GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CodeId"` CodeId valueTypes.Integer `json:"code_id"` CodeName valueTypes.String `json:"code_name"` diff --git a/iSolarCloud/WebIscmAppService/queryDutyType/struct.go b/iSolarCloud/WebIscmAppService/queryDutyType/struct.go index 37d75e145..416a83cde 100644 --- a/iSolarCloud/WebIscmAppService/queryDutyType/struct.go +++ b/iSolarCloud/WebIscmAppService/queryDutyType/struct.go @@ -5,9 +5,9 @@ package queryDutyType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/queryReportDataById/data.go b/iSolarCloud/WebIscmAppService/queryReportDataById/data.go index a4d4ef1b5..5fa124497 100644 --- a/iSolarCloud/WebIscmAppService/queryReportDataById/data.go +++ b/iSolarCloud/WebIscmAppService/queryReportDataById/data.go @@ -1,11 +1,12 @@ package queryReportDataById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/queryReportDataById" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go b/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go index fe4df382c..802ad60eb 100644 --- a/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go +++ b/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go @@ -5,9 +5,9 @@ package queryReportDataById import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/resetPasW/data.go b/iSolarCloud/WebIscmAppService/resetPasW/data.go index 61f099f23..970beab42 100644 --- a/iSolarCloud/WebIscmAppService/resetPasW/data.go +++ b/iSolarCloud/WebIscmAppService/resetPasW/data.go @@ -1,11 +1,12 @@ package resetPasW import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/resetPasW" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/resetPasW/struct.go b/iSolarCloud/WebIscmAppService/resetPasW/struct.go index 4a20ccae0..6d4a28530 100644 --- a/iSolarCloud/WebIscmAppService/resetPasW/struct.go +++ b/iSolarCloud/WebIscmAppService/resetPasW/struct.go @@ -5,9 +5,9 @@ package resetPasW import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveAuthKey/data.go b/iSolarCloud/WebIscmAppService/saveAuthKey/data.go index e286bb645..ff3c782b2 100644 --- a/iSolarCloud/WebIscmAppService/saveAuthKey/data.go +++ b/iSolarCloud/WebIscmAppService/saveAuthKey/data.go @@ -1,11 +1,12 @@ package saveAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveAuthKey" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go b/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go index d2cee23fa..6d8f4f8df 100644 --- a/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go +++ b/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go @@ -5,9 +5,9 @@ package saveAuthKey import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveDevice/data.go b/iSolarCloud/WebIscmAppService/saveDevice/data.go index d87ed5df3..7badc97ab 100644 --- a/iSolarCloud/WebIscmAppService/saveDevice/data.go +++ b/iSolarCloud/WebIscmAppService/saveDevice/data.go @@ -1,11 +1,12 @@ package saveDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveDevice/struct.go b/iSolarCloud/WebIscmAppService/saveDevice/struct.go index 936680a06..350264952 100644 --- a/iSolarCloud/WebIscmAppService/saveDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/saveDevice/struct.go @@ -5,9 +5,9 @@ package saveDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go index e1542f5bc..0ac6196c6 100644 --- a/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go +++ b/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go @@ -1,11 +1,12 @@ package saveDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveDeviceFactory" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go index 90ce7db9d..e232b0f3a 100644 --- a/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go +++ b/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go @@ -5,9 +5,9 @@ package saveDeviceFactory import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveDeviceType/data.go b/iSolarCloud/WebIscmAppService/saveDeviceType/data.go index a569ac9df..aad5d0f7c 100644 --- a/iSolarCloud/WebIscmAppService/saveDeviceType/data.go +++ b/iSolarCloud/WebIscmAppService/saveDeviceType/data.go @@ -1,11 +1,12 @@ package saveDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveDeviceType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go b/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go index 8b8b9f3cd..f791f5eab 100644 --- a/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go +++ b/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go @@ -5,9 +5,9 @@ package saveDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go b/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go index eb803366e..600adc6f0 100644 --- a/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go +++ b/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go @@ -1,11 +1,12 @@ package saveIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/saveIrradiationData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go index 368d66401..53b2d52bc 100644 --- a/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go +++ b/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go @@ -5,9 +5,9 @@ package saveIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveModelPoints/data.go b/iSolarCloud/WebIscmAppService/saveModelPoints/data.go index 2c589cf8e..25da67e7b 100644 --- a/iSolarCloud/WebIscmAppService/saveModelPoints/data.go +++ b/iSolarCloud/WebIscmAppService/saveModelPoints/data.go @@ -1,11 +1,12 @@ package saveModelPoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveModelPoints" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go b/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go index 57809b4f4..538558374 100644 --- a/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go +++ b/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go @@ -5,9 +5,9 @@ package saveModelPoints import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveNewNotice/data.go b/iSolarCloud/WebIscmAppService/saveNewNotice/data.go index 50ad095d0..5ccf94c70 100644 --- a/iSolarCloud/WebIscmAppService/saveNewNotice/data.go +++ b/iSolarCloud/WebIscmAppService/saveNewNotice/data.go @@ -1,11 +1,12 @@ package saveNewNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/saveNewNotice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go b/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go index f7e98b169..4189faa95 100644 --- a/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go +++ b/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go @@ -5,9 +5,9 @@ package saveNewNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go index d4c00c6d5..2e4d39290 100644 --- a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go +++ b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go @@ -1,11 +1,12 @@ package saveOrUpdateReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/reportService/saveOrUpdateReport" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go index bcadc00ba..8a3c10d7a 100644 --- a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go +++ b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go @@ -5,9 +5,9 @@ package saveOrUpdateReport import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveOrgNode/data.go b/iSolarCloud/WebIscmAppService/saveOrgNode/data.go index 78ab219bd..06e50eb7d 100644 --- a/iSolarCloud/WebIscmAppService/saveOrgNode/data.go +++ b/iSolarCloud/WebIscmAppService/saveOrgNode/data.go @@ -1,11 +1,12 @@ package saveOrgNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/saveOrgNode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go b/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go index a3cc1e8e9..c9b028e9d 100644 --- a/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go +++ b/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go @@ -5,9 +5,9 @@ package saveOrgNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go b/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go index de44f826f..ac242aad5 100644 --- a/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go +++ b/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go @@ -1,11 +1,12 @@ package saveOrgUsers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/saveOrgUsers" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go b/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go index e17d52a8d..6b8c9b3f9 100644 --- a/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go +++ b/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go @@ -5,9 +5,9 @@ package saveOrgUsers import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePicture/data.go b/iSolarCloud/WebIscmAppService/savePicture/data.go index ac34dfb82..b18a879e7 100644 --- a/iSolarCloud/WebIscmAppService/savePicture/data.go +++ b/iSolarCloud/WebIscmAppService/savePicture/data.go @@ -1,11 +1,12 @@ package savePicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePicture" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePicture/struct.go b/iSolarCloud/WebIscmAppService/savePicture/struct.go index fe38f0434..795185a02 100644 --- a/iSolarCloud/WebIscmAppService/savePicture/struct.go +++ b/iSolarCloud/WebIscmAppService/savePicture/struct.go @@ -5,9 +5,9 @@ package savePicture import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePointManage/data.go b/iSolarCloud/WebIscmAppService/savePointManage/data.go index 8cf120c67..90c771df2 100644 --- a/iSolarCloud/WebIscmAppService/savePointManage/data.go +++ b/iSolarCloud/WebIscmAppService/savePointManage/data.go @@ -1,11 +1,12 @@ package savePointManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePointManage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePointManage/struct.go b/iSolarCloud/WebIscmAppService/savePointManage/struct.go index edc2cfe1a..4dfb8f3b0 100644 --- a/iSolarCloud/WebIscmAppService/savePointManage/struct.go +++ b/iSolarCloud/WebIscmAppService/savePointManage/struct.go @@ -5,9 +5,9 @@ package savePointManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go index 6c7091282..d923c272a 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go @@ -1,11 +1,12 @@ package savePowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerDeviceChannl" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go index a947b5151..70e481024 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go @@ -5,9 +5,9 @@ package savePowerDeviceChannl import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go index b9c268d84..923bc8e5a 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go @@ -1,11 +1,12 @@ package savePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerDeviceModel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go index 290c55b9e..5a4e7e4ab 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go @@ -5,9 +5,9 @@ package savePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go index feff0de06..7608f64d3 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go @@ -1,11 +1,12 @@ package savePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerDeviceParameterPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go index caa26503a..825b83cfa 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go @@ -5,9 +5,9 @@ package savePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go index d7926ecd3..39cc2ad85 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go @@ -1,11 +1,12 @@ package savePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerDeviceSubType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go index 72d81ecf8..7077e33e4 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go @@ -5,9 +5,9 @@ package savePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go index 901954ec7..e432439ed 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go @@ -1,11 +1,12 @@ package savePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/savePowerDeviceTechnical" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go index ab89a4cd3..e4c8eefa0 100644 --- a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go @@ -5,9 +5,9 @@ package savePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerPlan/data.go b/iSolarCloud/WebIscmAppService/savePowerPlan/data.go index ae4e181d6..1b6a6abad 100644 --- a/iSolarCloud/WebIscmAppService/savePowerPlan/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerPlan/data.go @@ -1,11 +1,12 @@ package savePowerPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePowerPlan" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go b/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go index 8c49b68b8..302de278b 100644 --- a/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go @@ -5,9 +5,9 @@ package savePowerPlan import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go index 5cd927634..b3c7ff386 100644 --- a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go @@ -1,11 +1,12 @@ package savePowerStationByPowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/savePowerStationByPowerStore" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go index 8a097d5c5..420338484 100644 --- a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go @@ -5,9 +5,9 @@ package savePowerStationByPowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePowerStore/data.go b/iSolarCloud/WebIscmAppService/savePowerStore/data.go index 7b19d7089..39277a439 100644 --- a/iSolarCloud/WebIscmAppService/savePowerStore/data.go +++ b/iSolarCloud/WebIscmAppService/savePowerStore/data.go @@ -1,11 +1,12 @@ package savePowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/otherService/savePowerStore" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePowerStore/struct.go b/iSolarCloud/WebIscmAppService/savePowerStore/struct.go index 99f5387cf..15c9f5f47 100644 --- a/iSolarCloud/WebIscmAppService/savePowerStore/struct.go +++ b/iSolarCloud/WebIscmAppService/savePowerStore/struct.go @@ -5,9 +5,9 @@ package savePowerStore import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/savePsOrg/data.go b/iSolarCloud/WebIscmAppService/savePsOrg/data.go index 9a9ec0c9c..3f3c53b52 100644 --- a/iSolarCloud/WebIscmAppService/savePsOrg/data.go +++ b/iSolarCloud/WebIscmAppService/savePsOrg/data.go @@ -1,11 +1,12 @@ package savePsOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/savePsOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/savePsOrg/struct.go b/iSolarCloud/WebIscmAppService/savePsOrg/struct.go index ee7e7cc73..7f0f4682e 100644 --- a/iSolarCloud/WebIscmAppService/savePsOrg/struct.go +++ b/iSolarCloud/WebIscmAppService/savePsOrg/struct.go @@ -5,9 +5,9 @@ package savePsOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveRelDevice/data.go b/iSolarCloud/WebIscmAppService/saveRelDevice/data.go index 885404f46..fa09ebc28 100644 --- a/iSolarCloud/WebIscmAppService/saveRelDevice/data.go +++ b/iSolarCloud/WebIscmAppService/saveRelDevice/data.go @@ -1,11 +1,12 @@ package saveRelDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/saveRelDevice" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go b/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go index 470609a27..5d53aeabe 100644 --- a/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go @@ -5,9 +5,9 @@ package saveRelDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go b/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go index 56d93c66d..ea1990be5 100644 --- a/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go +++ b/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go @@ -1,11 +1,12 @@ package saveRoleAssign import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/saveRoleAssign" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go b/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go index d869918bc..d3fe0ba84 100644 --- a/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go +++ b/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go @@ -5,9 +5,9 @@ package saveRoleAssign import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveSysMenu/data.go b/iSolarCloud/WebIscmAppService/saveSysMenu/data.go index 69738a8ea..03df75d25 100644 --- a/iSolarCloud/WebIscmAppService/saveSysMenu/data.go +++ b/iSolarCloud/WebIscmAppService/saveSysMenu/data.go @@ -1,11 +1,12 @@ package saveSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/saveSysMenu" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go b/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go index 03af310fc..f0342e690 100644 --- a/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go +++ b/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go @@ -5,9 +5,9 @@ package saveSysMenu import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveSysOrg/data.go b/iSolarCloud/WebIscmAppService/saveSysOrg/data.go index 910a09a58..1092c8deb 100644 --- a/iSolarCloud/WebIscmAppService/saveSysOrg/data.go +++ b/iSolarCloud/WebIscmAppService/saveSysOrg/data.go @@ -1,11 +1,12 @@ package saveSysOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/saveSysOrg" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go b/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go index 17b7ad00e..865f9fda6 100644 --- a/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go +++ b/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go @@ -5,9 +5,9 @@ package saveSysOrg import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveSysRole/data.go b/iSolarCloud/WebIscmAppService/saveSysRole/data.go index 8183236b7..97b12f762 100644 --- a/iSolarCloud/WebIscmAppService/saveSysRole/data.go +++ b/iSolarCloud/WebIscmAppService/saveSysRole/data.go @@ -1,11 +1,12 @@ package saveSysRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/saveSysRole" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveSysRole/struct.go b/iSolarCloud/WebIscmAppService/saveSysRole/struct.go index 0725d2cf9..1e2480bec 100644 --- a/iSolarCloud/WebIscmAppService/saveSysRole/struct.go +++ b/iSolarCloud/WebIscmAppService/saveSysRole/struct.go @@ -5,9 +5,9 @@ package saveSysRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveSysUser/data.go b/iSolarCloud/WebIscmAppService/saveSysUser/data.go index 9a5490398..564f69842 100644 --- a/iSolarCloud/WebIscmAppService/saveSysUser/data.go +++ b/iSolarCloud/WebIscmAppService/saveSysUser/data.go @@ -1,11 +1,12 @@ package saveSysUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/saveSysUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveSysUser/struct.go b/iSolarCloud/WebIscmAppService/saveSysUser/struct.go index bab48e6b6..a885a37ba 100644 --- a/iSolarCloud/WebIscmAppService/saveSysUser/struct.go +++ b/iSolarCloud/WebIscmAppService/saveSysUser/struct.go @@ -5,9 +5,9 @@ package saveSysUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveUserNode/data.go b/iSolarCloud/WebIscmAppService/saveUserNode/data.go index 64f3dd4ee..0afa3ca69 100644 --- a/iSolarCloud/WebIscmAppService/saveUserNode/data.go +++ b/iSolarCloud/WebIscmAppService/saveUserNode/data.go @@ -1,11 +1,12 @@ package saveUserNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/orgService/saveUserNode" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveUserNode/struct.go b/iSolarCloud/WebIscmAppService/saveUserNode/struct.go index fd66238a2..c1a57f622 100644 --- a/iSolarCloud/WebIscmAppService/saveUserNode/struct.go +++ b/iSolarCloud/WebIscmAppService/saveUserNode/struct.go @@ -5,9 +5,9 @@ package saveUserNode import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/saveUserRole/data.go b/iSolarCloud/WebIscmAppService/saveUserRole/data.go index 854136255..6a38413d4 100644 --- a/iSolarCloud/WebIscmAppService/saveUserRole/data.go +++ b/iSolarCloud/WebIscmAppService/saveUserRole/data.go @@ -1,11 +1,12 @@ package saveUserRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/saveUserRole" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/saveUserRole/struct.go b/iSolarCloud/WebIscmAppService/saveUserRole/struct.go index 3e4f43747..85710a174 100644 --- a/iSolarCloud/WebIscmAppService/saveUserRole/struct.go +++ b/iSolarCloud/WebIscmAppService/saveUserRole/struct.go @@ -5,9 +5,9 @@ package saveUserRole import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go b/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go index d8b0aafe8..948aa6ba1 100644 --- a/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go +++ b/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go @@ -1,11 +1,12 @@ package searchIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/powerStationService/searchIrradiationData" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go index 9932e8ce3..1768fe740 100644 --- a/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go +++ b/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go @@ -5,9 +5,9 @@ package searchIrradiationData import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go b/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go index 655655b7e..3d5c738fa 100644 --- a/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go +++ b/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go @@ -1,11 +1,12 @@ package searchTechnicalNums import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/searchTechnicalNums" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go b/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go index e7d162171..bf91c057b 100644 --- a/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go +++ b/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go @@ -5,9 +5,9 @@ package searchTechnicalNums import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go index 234ea32fa..1bc06a55f 100644 --- a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go +++ b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go @@ -1,11 +1,12 @@ package selectDeviceTypeByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/selectDeviceTypeByPsId" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go index 0363b8425..bec109293 100644 --- a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go +++ b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go @@ -5,9 +5,9 @@ package selectDeviceTypeByPsId import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go index 3559a0e8e..ee3ff4e15 100644 --- a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go +++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go @@ -1,11 +1,12 @@ package selectPowerDeviceTechnicals import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/selectPowerDeviceTechnicals" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go index 93a85ab2a..874ec4b4b 100644 --- a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go +++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go @@ -5,9 +5,9 @@ package selectPowerDeviceTechnicals import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go index 0a57e6593..da4c964f4 100644 --- a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go +++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go @@ -1,11 +1,12 @@ package selectPowerDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/selectPowerDeviceType" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go index b63044c41..ea43474bf 100644 --- a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go +++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go @@ -5,9 +5,9 @@ package selectPowerDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go index 792324bbd..86733ad8a 100644 --- a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go +++ b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go @@ -1,11 +1,12 @@ package setupUserRole4AddUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/setupUserRole4AddUser" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go index c9caab07e..4a368598e 100644 --- a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go +++ b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go @@ -5,9 +5,9 @@ package setupUserRole4AddUser import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/startWorkFlow/data.go b/iSolarCloud/WebIscmAppService/startWorkFlow/data.go index 67edac616..0eea8fc60 100644 --- a/iSolarCloud/WebIscmAppService/startWorkFlow/data.go +++ b/iSolarCloud/WebIscmAppService/startWorkFlow/data.go @@ -1,11 +1,12 @@ package startWorkFlow import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/startWorkFlow" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go b/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go index c55750708..b225024af 100644 --- a/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go +++ b/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go @@ -5,9 +5,9 @@ package startWorkFlow import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/struct.go b/iSolarCloud/WebIscmAppService/struct.go index b3571bf04..51886cefa 100644 --- a/iSolarCloud/WebIscmAppService/struct.go +++ b/iSolarCloud/WebIscmAppService/struct.go @@ -2,193 +2,194 @@ package WebIscmAppService import ( - "GoSungrow/iSolarCloud/WebIscmAppService/addPowerDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/addPowerPointManage" - "GoSungrow/iSolarCloud/WebIscmAppService/addSubTypeDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis" - "GoSungrow/iSolarCloud/WebIscmAppService/batchDelDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical" - "GoSungrow/iSolarCloud/WebIscmAppService/checkDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/contactMessageOpera" - "GoSungrow/iSolarCloud/WebIscmAppService/delDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteDeviceFactory" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteDeviceType" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteOneNotice" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePicture" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePointInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical" - "GoSungrow/iSolarCloud/WebIscmAppService/deletePowerStore" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteProcessDefinition" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteReport" - "GoSungrow/iSolarCloud/WebIscmAppService/deleteUserNode" - "GoSungrow/iSolarCloud/WebIscmAppService/deployProcess" - "GoSungrow/iSolarCloud/WebIscmAppService/editProcessManageAction" - "GoSungrow/iSolarCloud/WebIscmAppService/findImageInputStreamString" - "GoSungrow/iSolarCloud/WebIscmAppService/getAllDevTypeList" - "GoSungrow/iSolarCloud/WebIscmAppService/getAllNodeByType" - "GoSungrow/iSolarCloud/WebIscmAppService/getAuthKey" - "GoSungrow/iSolarCloud/WebIscmAppService/getAuthKeyList" - "GoSungrow/iSolarCloud/WebIscmAppService/getCodeByType" - "GoSungrow/iSolarCloud/WebIscmAppService/getContactMessage" - "GoSungrow/iSolarCloud/WebIscmAppService/getCountryNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getDefinitionIdByKey" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeploymentList" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/getDevicePro" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceSubType" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceTechnical" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceType" - "GoSungrow/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById" - "GoSungrow/iSolarCloud/WebIscmAppService/getDutyUserList" - "GoSungrow/iSolarCloud/WebIscmAppService/getFatherPrivileges" - "GoSungrow/iSolarCloud/WebIscmAppService/getGroupManSettings" - "GoSungrow/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers" - "GoSungrow/iSolarCloud/WebIscmAppService/getMaterialByListId" - "GoSungrow/iSolarCloud/WebIscmAppService/getMaterialByType" - "GoSungrow/iSolarCloud/WebIscmAppService/getMaterialList" - "GoSungrow/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId" - "GoSungrow/iSolarCloud/WebIscmAppService/getModelPoints" - "GoSungrow/iSolarCloud/WebIscmAppService/getMoneyUnitList" - "GoSungrow/iSolarCloud/WebIscmAppService/getNamecnNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getNationList" - "GoSungrow/iSolarCloud/WebIscmAppService/getOperationRecord" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgForPs" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgList" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgListForUser" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgNodeInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgStationList" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgStationListByPage" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgUserList" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgUserMapData" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtree" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtree4User" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtreeAsync" - "GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtreeForUser" - "GoSungrow/iSolarCloud/WebIscmAppService/getPictureList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPointInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getPointInfoPage" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceChannl" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceFactory" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceModelList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerPlanList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerStation" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerStationInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerStationList" - "GoSungrow/iSolarCloud/WebIscmAppService/getPowerStore" - "GoSungrow/iSolarCloud/WebIscmAppService/getProvcnNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getPsTreeMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getRoleByUserIds" - "GoSungrow/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId" - "GoSungrow/iSolarCloud/WebIscmAppService/getSettingUserMapData" - "GoSungrow/iSolarCloud/WebIscmAppService/getStateNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getSubTypeDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/getSysHomeList2" - "GoSungrow/iSolarCloud/WebIscmAppService/getSysMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getSysOrgPro" - "GoSungrow/iSolarCloud/WebIscmAppService/getSysUser" - "GoSungrow/iSolarCloud/WebIscmAppService/getSystemOrgInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getSystemRoleInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/getSystemRoleList2" - "GoSungrow/iSolarCloud/WebIscmAppService/getTownValueNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getUserMenuLs" - "GoSungrow/iSolarCloud/WebIscmAppService/getUserOrgPage" - "GoSungrow/iSolarCloud/WebIscmAppService/getVillageList" - "GoSungrow/iSolarCloud/WebIscmAppService/getVillageListNew" - "GoSungrow/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getZtreeChildMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getZtreeMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getZtreeSysMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/getZtreeSysMenu2" - "GoSungrow/iSolarCloud/WebIscmAppService/goToDevicePropertyPage" - "GoSungrow/iSolarCloud/WebIscmAppService/isCanAddUser" - "GoSungrow/iSolarCloud/WebIscmAppService/isHasIrradiationData" - "GoSungrow/iSolarCloud/WebIscmAppService/isHasPlan" - "GoSungrow/iSolarCloud/WebIscmAppService/loadDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/modelPointsPage" - "GoSungrow/iSolarCloud/WebIscmAppService/modifyDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl" - "GoSungrow/iSolarCloud/WebIscmAppService/modifySysOrg" - "GoSungrow/iSolarCloud/WebIscmAppService/modifySystemMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/modifySystemOrgNode" - "GoSungrow/iSolarCloud/WebIscmAppService/modifySystemRole" - "GoSungrow/iSolarCloud/WebIscmAppService/modifySystemUser" - "GoSungrow/iSolarCloud/WebIscmAppService/publishNotice" - "GoSungrow/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys" - "GoSungrow/iSolarCloud/WebIscmAppService/queryDutyType" - "GoSungrow/iSolarCloud/WebIscmAppService/queryReportDataById" - "GoSungrow/iSolarCloud/WebIscmAppService/resetPasW" - "GoSungrow/iSolarCloud/WebIscmAppService/saveAuthKey" - "GoSungrow/iSolarCloud/WebIscmAppService/saveDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/saveDeviceFactory" - "GoSungrow/iSolarCloud/WebIscmAppService/saveDeviceType" - "GoSungrow/iSolarCloud/WebIscmAppService/saveIrradiationData" - "GoSungrow/iSolarCloud/WebIscmAppService/saveModelPoints" - "GoSungrow/iSolarCloud/WebIscmAppService/saveNewNotice" - "GoSungrow/iSolarCloud/WebIscmAppService/saveOrUpdateReport" - "GoSungrow/iSolarCloud/WebIscmAppService/saveOrgNode" - "GoSungrow/iSolarCloud/WebIscmAppService/saveOrgUsers" - "GoSungrow/iSolarCloud/WebIscmAppService/savePicture" - "GoSungrow/iSolarCloud/WebIscmAppService/savePointManage" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceChannl" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceSubType" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerPlan" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore" - "GoSungrow/iSolarCloud/WebIscmAppService/savePowerStore" - "GoSungrow/iSolarCloud/WebIscmAppService/savePsOrg" - "GoSungrow/iSolarCloud/WebIscmAppService/saveRelDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/saveRoleAssign" - "GoSungrow/iSolarCloud/WebIscmAppService/saveSysMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/saveSysOrg" - "GoSungrow/iSolarCloud/WebIscmAppService/saveSysRole" - "GoSungrow/iSolarCloud/WebIscmAppService/saveSysUser" - "GoSungrow/iSolarCloud/WebIscmAppService/saveUserNode" - "GoSungrow/iSolarCloud/WebIscmAppService/saveUserRole" - "GoSungrow/iSolarCloud/WebIscmAppService/searchIrradiationData" - "GoSungrow/iSolarCloud/WebIscmAppService/searchTechnicalNums" - "GoSungrow/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId" - "GoSungrow/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals" - "GoSungrow/iSolarCloud/WebIscmAppService/selectPowerDeviceType" - "GoSungrow/iSolarCloud/WebIscmAppService/setupUserRole4AddUser" - "GoSungrow/iSolarCloud/WebIscmAppService/startWorkFlow" - "GoSungrow/iSolarCloud/WebIscmAppService/updateDevice" - "GoSungrow/iSolarCloud/WebIscmAppService/updateDeviceType" - "GoSungrow/iSolarCloud/WebIscmAppService/updateFaultLevel" - "GoSungrow/iSolarCloud/WebIscmAppService/updateNotice" - "GoSungrow/iSolarCloud/WebIscmAppService/updatePointInfo" - "GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage" - "GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType" - "GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical" - "GoSungrow/iSolarCloud/WebIscmAppService/updateProcessManage" - "GoSungrow/iSolarCloud/WebIscmAppService/updateSysOrgPro" - "GoSungrow/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag" - "GoSungrow/iSolarCloud/WebIscmAppService/updateUserValidFlag" - "GoSungrow/iSolarCloud/WebIscmAppService/updateValidFlag" - "GoSungrow/iSolarCloud/WebIscmAppService/viewDeviceModel" - "GoSungrow/iSolarCloud/WebIscmAppService/viewDeviceParameter" - "GoSungrow/iSolarCloud/WebIscmAppService/workFlowImplementStep" - "GoSungrow/iSolarCloud/WebIscmAppService/workFlowIsStart" - "GoSungrow/iSolarCloud/WebIscmAppService/workFlowTransferStep" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/addPowerDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/addPowerPointManage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/addSubTypeDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/batchDelDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/checkDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/contactMessageOpera" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/delDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteDeviceFactory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteDeviceType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteOneNotice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePicture" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deletePowerStore" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteProcessDefinition" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deleteUserNode" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/deployProcess" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/editProcessManageAction" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/findImageInputStreamString" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getAllDevTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getAllNodeByType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getAuthKey" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getAuthKeyList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getCodeByType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getContactMessage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getCountryNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDefinitionIdByKey" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeploymentList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDevicePro" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceSubType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getDutyUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getFatherPrivileges" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getGroupManSettings" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMaterialByListId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMaterialByType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMaterialList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getModelPoints" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMoneyUnitList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getNamecnNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getNationList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOperationRecord" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgForPs" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgListForUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgNodeInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgStationList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgStationListByPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgUserMapData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtree4User" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtreeAsync" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getOrgZtreeForUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPictureList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPointInfoPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceChannl" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceFactory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceModelList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerPlanList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerStation" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerStationList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPowerStore" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getProvcnNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPsTreeMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getRoleByUserIds" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSettingUserMapData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getStateNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSubTypeDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSysHomeList2" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSysMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSysOrgPro" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSysUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSystemOrgInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSystemRoleInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getSystemRoleList2" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getTownValueNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getUserMenuLs" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getUserOrgPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getVillageList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getVillageListNew" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getZtreeChildMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getZtreeMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getZtreeSysMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getZtreeSysMenu2" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/goToDevicePropertyPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/isCanAddUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/isHasIrradiationData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/isHasPlan" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/loadDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modelPointsPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifyDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifySysOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifySystemMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifySystemOrgNode" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifySystemRole" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/modifySystemUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/publishNotice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/queryDutyType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/queryReportDataById" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/resetPasW" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveAuthKey" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveDeviceFactory" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveDeviceType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveIrradiationData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveModelPoints" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveNewNotice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveOrUpdateReport" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveOrgNode" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveOrgUsers" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePicture" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePointManage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceChannl" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceSubType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerPlan" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePowerStore" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/savePsOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveRelDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveRoleAssign" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveSysMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveSysOrg" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveSysRole" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveSysUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveUserNode" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/saveUserRole" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/searchIrradiationData" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/searchTechnicalNums" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/selectPowerDeviceType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/setupUserRole4AddUser" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/startWorkFlow" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateDevice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateDeviceType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateFaultLevel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateNotice" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updatePointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateProcessManage" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateSysOrgPro" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateUserValidFlag" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/updateValidFlag" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/viewDeviceModel" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/viewDeviceParameter" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/workFlowImplementStep" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/workFlowIsStart" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/workFlowTransferStep" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) var _ api.Area = (*Area)(nil) @@ -320,27 +321,27 @@ func Init(apiRoot api.Web) Area { api.GetName(isCanAddUser.EndPoint{}): isCanAddUser.Init(apiRoot), api.GetName(isHasIrradiationData.EndPoint{}): isHasIrradiationData.Init(apiRoot), api.GetName(isHasPlan.EndPoint{}): isHasPlan.Init(apiRoot), - api.GetName(loadDevice.EndPoint{}): loadDevice.Init(apiRoot), - api.GetName(modelPointsPage.EndPoint{}): modelPointsPage.Init(apiRoot), - api.GetName(modifyDevice.EndPoint{}): modifyDevice.Init(apiRoot), - api.GetName(modifyPowerDeviceChannl.EndPoint{}): modifyPowerDeviceChannl.Init(apiRoot), - api.GetName(modifySysOrg.EndPoint{}): modifySysOrg.Init(apiRoot), - api.GetName(modifySystemMenu.EndPoint{}): modifySystemMenu.Init(apiRoot), - api.GetName(modifySystemOrgNode.EndPoint{}): modifySystemOrgNode.Init(apiRoot), - api.GetName(modifySystemRole.EndPoint{}): modifySystemRole.Init(apiRoot), - api.GetName(modifySystemUser.EndPoint{}): modifySystemUser.Init(apiRoot), - api.GetName(publishNotice.EndPoint{}): publishNotice.Init(apiRoot), - api.GetName(queryDeviceListForBackSys.EndPoint{}): queryDeviceListForBackSys.Init(apiRoot), - api.GetName(queryDutyType.EndPoint{}): queryDutyType.Init(apiRoot), - api.GetName(queryReportDataById.EndPoint{}): queryReportDataById.Init(apiRoot), - api.GetName(resetPasW.EndPoint{}): resetPasW.Init(apiRoot), - api.GetName(saveAuthKey.EndPoint{}): saveAuthKey.Init(apiRoot), - api.GetName(saveDevice.EndPoint{}): saveDevice.Init(apiRoot), - api.GetName(saveDeviceFactory.EndPoint{}): saveDeviceFactory.Init(apiRoot), - api.GetName(saveDeviceType.EndPoint{}): saveDeviceType.Init(apiRoot), - api.GetName(saveIrradiationData.EndPoint{}): saveIrradiationData.Init(apiRoot), - api.GetName(saveModelPoints.EndPoint{}): saveModelPoints.Init(apiRoot), - api.GetName(saveNewNotice.EndPoint{}): saveNewNotice.Init(apiRoot), + api.GetName(loadDevice.EndPoint{}): loadDevice.Init(apiRoot), + api.GetName(modelPointsPage.EndPoint{}): modelPointsPage.Init(apiRoot), + api.GetName(modifyDevice.EndPoint{}): modifyDevice.Init(apiRoot), + api.GetName(modifyPowerDeviceChannl.EndPoint{}): modifyPowerDeviceChannl.Init(apiRoot), + api.GetName(modifySysOrg.EndPoint{}): modifySysOrg.Init(apiRoot), + api.GetName(modifySystemMenu.EndPoint{}): modifySystemMenu.Init(apiRoot), + api.GetName(modifySystemOrgNode.EndPoint{}): modifySystemOrgNode.Init(apiRoot), + api.GetName(modifySystemRole.EndPoint{}): modifySystemRole.Init(apiRoot), + api.GetName(modifySystemUser.EndPoint{}): modifySystemUser.Init(apiRoot), + api.GetName(publishNotice.EndPoint{}): publishNotice.Init(apiRoot), + api.GetName(queryDeviceListForBackSys.EndPoint{}): queryDeviceListForBackSys.Init(apiRoot), + api.GetName(queryDutyType.EndPoint{}): queryDutyType.Init(apiRoot), + api.GetName(queryReportDataById.EndPoint{}): queryReportDataById.Init(apiRoot), + api.GetName(resetPasW.EndPoint{}): resetPasW.Init(apiRoot), + api.GetName(saveAuthKey.EndPoint{}): saveAuthKey.Init(apiRoot), + api.GetName(saveDevice.EndPoint{}): saveDevice.Init(apiRoot), + api.GetName(saveDeviceFactory.EndPoint{}): saveDeviceFactory.Init(apiRoot), + api.GetName(saveDeviceType.EndPoint{}): saveDeviceType.Init(apiRoot), + api.GetName(saveIrradiationData.EndPoint{}): saveIrradiationData.Init(apiRoot), + api.GetName(saveModelPoints.EndPoint{}): saveModelPoints.Init(apiRoot), + api.GetName(saveNewNotice.EndPoint{}): saveNewNotice.Init(apiRoot), api.GetName(saveOrUpdateReport.EndPoint{}): saveOrUpdateReport.Init(apiRoot), api.GetName(saveOrgNode.EndPoint{}): saveOrgNode.Init(apiRoot), api.GetName(saveOrgUsers.EndPoint{}): saveOrgUsers.Init(apiRoot), diff --git a/iSolarCloud/WebIscmAppService/updateDevice/data.go b/iSolarCloud/WebIscmAppService/updateDevice/data.go index c4b250c01..f1129e564 100644 --- a/iSolarCloud/WebIscmAppService/updateDevice/data.go +++ b/iSolarCloud/WebIscmAppService/updateDevice/data.go @@ -1,10 +1,11 @@ package updateDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateDevice/struct.go b/iSolarCloud/WebIscmAppService/updateDevice/struct.go index a06366d39..d8cfcb338 100644 --- a/iSolarCloud/WebIscmAppService/updateDevice/struct.go +++ b/iSolarCloud/WebIscmAppService/updateDevice/struct.go @@ -5,9 +5,9 @@ package updateDevice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateDeviceType/data.go b/iSolarCloud/WebIscmAppService/updateDeviceType/data.go index addcd1c2c..fa422f1f1 100644 --- a/iSolarCloud/WebIscmAppService/updateDeviceType/data.go +++ b/iSolarCloud/WebIscmAppService/updateDeviceType/data.go @@ -1,10 +1,11 @@ package updateDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go b/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go index b265a6d7e..1328e82fd 100644 --- a/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go +++ b/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go @@ -5,9 +5,9 @@ package updateDeviceType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go b/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go index ce4b826b0..0a7b6ead8 100644 --- a/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go +++ b/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go @@ -1,11 +1,12 @@ package updateFaultLevel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/faultService/updateFaultLevel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go b/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go index 326c86967..6ad4ac5b1 100644 --- a/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go +++ b/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go @@ -5,9 +5,9 @@ package updateFaultLevel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateNotice/data.go b/iSolarCloud/WebIscmAppService/updateNotice/data.go index 750ad70c3..fd152dbb0 100644 --- a/iSolarCloud/WebIscmAppService/updateNotice/data.go +++ b/iSolarCloud/WebIscmAppService/updateNotice/data.go @@ -1,10 +1,11 @@ package updateNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateNotice/struct.go b/iSolarCloud/WebIscmAppService/updateNotice/struct.go index 923a4af3c..a1ccdd850 100644 --- a/iSolarCloud/WebIscmAppService/updateNotice/struct.go +++ b/iSolarCloud/WebIscmAppService/updateNotice/struct.go @@ -5,9 +5,9 @@ package updateNotice import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updatePointInfo/data.go b/iSolarCloud/WebIscmAppService/updatePointInfo/data.go index 5d10ebf73..71dc9af9d 100644 --- a/iSolarCloud/WebIscmAppService/updatePointInfo/data.go +++ b/iSolarCloud/WebIscmAppService/updatePointInfo/data.go @@ -1,9 +1,9 @@ package updatePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" ) @@ -13,12 +13,12 @@ const Disabled = false const EndPointName = "WebIscmAppService.updatePointInfo" type RequestData struct { - PointName valueTypes.String `json:"point_name"` - Id valueTypes.String `json:"id" required:"true"` - DeviceType valueTypes.Integer `json:"device_type" required:"true"` - PointId valueTypes.String `json:"point_id" required:"true"` - PointType valueTypes.String `json:"point_type"` - PointGroupId valueTypes.String `json:"point_group_id"` + PointName valueTypes.String `json:"point_name"` + Id valueTypes.String `json:"id" required:"true"` + DeviceType valueTypes.Integer `json:"device_type" required:"true"` + PointId valueTypes.String `json:"point_id" required:"true"` + PointType valueTypes.String `json:"point_type"` + PointGroupId valueTypes.String `json:"point_group_id"` } func (rd *RequestData) IsValid() error { diff --git a/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go b/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go index d178997f2..cdfe4b67f 100644 --- a/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go +++ b/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go @@ -5,9 +5,9 @@ package updatePointInfo import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go index 4b839355e..7fc7529b1 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go @@ -1,11 +1,12 @@ package updatePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updatePowerDeviceModel" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go index 3931f49d5..a3ebd8d06 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go @@ -5,9 +5,9 @@ package updatePowerDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go index a7f492d47..92acf142a 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go @@ -1,11 +1,12 @@ package updatePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updatePowerDeviceParameterPage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go index 27a34a179..ad5ba5479 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go @@ -5,9 +5,9 @@ package updatePowerDeviceParameterPage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go index df564ed34..5feb28803 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go @@ -1,10 +1,11 @@ package updatePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go index 2bd5ae4fe..910e8e243 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go @@ -5,9 +5,9 @@ package updatePowerDeviceSubType import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go index 54cef16b7..b92822c27 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go @@ -1,11 +1,12 @@ package updatePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/devService/updatePowerDeviceTechnical" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go index fa4fbee6b..98c318693 100644 --- a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go +++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go @@ -5,9 +5,9 @@ package updatePowerDeviceTechnical import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateProcessManage/data.go b/iSolarCloud/WebIscmAppService/updateProcessManage/data.go index 7cd6d086c..f42827a5a 100644 --- a/iSolarCloud/WebIscmAppService/updateProcessManage/data.go +++ b/iSolarCloud/WebIscmAppService/updateProcessManage/data.go @@ -1,11 +1,12 @@ package updateProcessManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" - "github.com/MickMake/GoUnify/Only" "fmt" + + "github.com/MickMake/GoUnify/Only" ) const Url = "/v1/userService/updateProcessManage" @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go b/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go index c60452928..876aaa358 100644 --- a/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go +++ b/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go @@ -5,9 +5,9 @@ package updateProcessManage import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go b/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go index 1004bee9d..0f102961c 100644 --- a/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go +++ b/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go @@ -1,10 +1,11 @@ package updateSysOrgPro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go b/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go index 67857ec4a..fa6f091b8 100644 --- a/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go +++ b/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go @@ -5,9 +5,9 @@ package updateSysOrgPro import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go index 45eaf979f..3e560629a 100644 --- a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go +++ b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go @@ -1,10 +1,11 @@ package updateSysRoleValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go index c75dcba1e..70ce3d053 100644 --- a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go +++ b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go @@ -5,17 +5,17 @@ package updateSysRoleValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +54,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +75,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +168,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +241,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +296,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +319,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +358,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +389,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go index 4eb14826a..e8f5ceed2 100644 --- a/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go +++ b/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go @@ -1,10 +1,11 @@ package updateUserValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go index 39fc85f7c..d40b77e6c 100644 --- a/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go +++ b/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go @@ -5,9 +5,9 @@ package updateUserValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" "encoding/json" @@ -16,7 +16,6 @@ import ( "time" ) - // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -54,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -76,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -168,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -242,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -298,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -322,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -362,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -394,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/updateValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateValidFlag/data.go index 5d1a251d8..7b408d891 100644 --- a/iSolarCloud/WebIscmAppService/updateValidFlag/data.go +++ b/iSolarCloud/WebIscmAppService/updateValidFlag/data.go @@ -1,10 +1,11 @@ package updateValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } @@ -34,7 +34,6 @@ func (e *ResultData) IsValid() error { return err } - func (e *EndPoint) GetData() api.DataMap { entries := api.NewDataMap() diff --git a/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go index 3e7e096e3..e4a45c59b 100644 --- a/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go +++ b/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go @@ -5,16 +5,16 @@ package updateValidFlag import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go b/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go index e8b7c8ac0..a9f370c08 100644 --- a/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go +++ b/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go @@ -1,10 +1,11 @@ package viewDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go index 874435e3d..f9b4d4362 100644 --- a/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go +++ b/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go @@ -5,16 +5,16 @@ package viewDeviceModel import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go b/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go index a7cefa48f..bc43abc7c 100644 --- a/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go +++ b/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go @@ -1,10 +1,11 @@ package viewDeviceParameter import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) diff --git a/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go b/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go index 7784ed502..b8079a3b0 100644 --- a/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go +++ b/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go @@ -5,16 +5,16 @@ package viewDeviceParameter import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go b/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go index c0ecdd73b..f098e56c7 100644 --- a/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go +++ b/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go @@ -1,10 +1,11 @@ package workFlowImplementStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go b/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go index f1cafeada..ecb9a5cac 100644 --- a/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go +++ b/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go @@ -5,16 +5,16 @@ package workFlowImplementStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go b/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go index de78b73ae..5beede44b 100644 --- a/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go +++ b/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go @@ -1,10 +1,11 @@ package workFlowIsStart import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go b/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go index dc91b693b..6847ea22d 100644 --- a/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go +++ b/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go @@ -5,16 +5,16 @@ package workFlowIsStart import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go b/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go index cd6863cb0..ed2caabc1 100644 --- a/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go +++ b/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go @@ -1,10 +1,11 @@ package workFlowTransferStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" "fmt" + "github.com/MickMake/GoUnify/Only" ) @@ -24,7 +25,6 @@ func (rd RequestData) Help() string { return ret } - type ResultData struct { // Dummy valueTypes.String `json:"dummy"` } diff --git a/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go b/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go index 3ddba5774..c2afea72e 100644 --- a/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go +++ b/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go @@ -5,16 +5,16 @@ package workFlowTransferStep import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) // api.EndPoint - Import API endpoint interface var _ api.EndPoint = (*EndPoint)(nil) @@ -53,7 +53,6 @@ func Init(apiRoot api.Web) EndPoint { } } - // ******************************************************************************** // // Methods not scoped by api.EndPoint interface type @@ -75,18 +74,19 @@ func (e EndPoint) GetResponse() Response { } // Assert - Used to obtain locally scoped EndPoint methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func Assert(e api.EndPoint) EndPoint { return e.(EndPoint) } // AssertResultData - Used to obtain locally scoped ResultData methods, (not visible from api.EndPoint). +// //goland:noinspection GoUnusedExportedFunction func AssertResultData(e api.EndPoint) ResultData { return e.(EndPoint).Response.ResultData } - // ******************************************************************************** // // Methods defined by api.EndPoint interface type @@ -167,7 +167,6 @@ func (e EndPoint) WriteDataFile() error { return e.ApiWriteDataFile(e.Response.ResultData) } - // ******************************************************************************** // SetRequest - Save an interface reference as either api.RequestCommon or RequestData. @@ -241,7 +240,6 @@ func (e EndPoint) IsRequestValid() error { return e.Error } - // ******************************************************************************** // SetResponse - Save a JSON string to the Response structure. @@ -297,7 +295,6 @@ func (e EndPoint) ResponseString() string { return output.GetRequestString(e.Response) } - // ******************************************************************************** // MarshalJSON - Marshall the EndPoint. @@ -321,7 +318,6 @@ func (e EndPoint) MarshalJSON() ([]byte, error) { // }) } - // ******************************************************************************** // RequestFingerprint - Check if a cache file exists for this EndPoint. @@ -361,7 +357,6 @@ func (e EndPoint) GetCacheTimeout() time.Duration { return e.ApiRoot.GetCacheTimeout() } - func (e EndPoint) GetEndPointData() api.DataMap { return e.GetData() } @@ -393,4 +388,3 @@ func (e EndPoint) ResultDataRef() ResultData { func (e EndPoint) IsDebug() bool { return e.ApiIsDebug() } - diff --git a/iSolarCloud/api/GoStruct/output/struct_graph.go b/iSolarCloud/api/GoStruct/output/struct_graph.go index ae0ceffb2..5768967c9 100644 --- a/iSolarCloud/api/GoStruct/output/struct_graph.go +++ b/iSolarCloud/api/GoStruct/output/struct_graph.go @@ -1,24 +1,25 @@ package output import ( - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" - "github.com/wcharczuk/go-chart/v2" - "github.com/wcharczuk/go-chart/v2/drawing" "os" "strings" "time" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" + "github.com/wcharczuk/go-chart/v2" + "github.com/wcharczuk/go-chart/v2/drawing" ) + // "go.pennock.tech/tabular" // tabular "github.com/agrison/go-tablib" - type GraphRequest struct { - Title string `json:"title"` - SubTitle string `json:"sub_title"` + Title string `json:"title"` + SubTitle string `json:"sub_title"` TimeColumn *string `json:"time_column"` DataColumn *string `json:"value_column"` @@ -33,10 +34,9 @@ type GraphRequest struct { // DataColumn *string `json:"data_column"` // SearchString *string `json:"search_string"` - Error error `json:"-"` + Error error `json:"-"` } - func JsonToGraphRequest(j Json) GraphRequest { var ret GraphRequest for range Only.Once { @@ -273,7 +273,6 @@ func (t *Table) CreateGraph() error { return t.Error } - type Chart struct { Error error `json:"-"` @@ -292,14 +291,14 @@ func New() *Chart { var c Chart for range Only.Once { - c.timeSeries1 = chart.TimeSeries { + c.timeSeries1 = chart.TimeSeries{ Name: "", Style: chart.Style{}, YAxis: chart.YAxisPrimary, XValues: []time.Time{}, YValues: []float64{}, } - c.timeSeries2 = chart.TimeSeries { + c.timeSeries2 = chart.TimeSeries{ Name: "", Style: chart.Style{}, YAxis: chart.YAxisSecondary, @@ -307,20 +306,19 @@ func New() *Chart { YValues: []float64{}, } - c.annotation = chart.AnnotationSeries { - Annotations: []chart.Value2 { - }, + c.annotation = chart.AnnotationSeries{ + Annotations: []chart.Value2{}, } - c.graph = chart.Chart { - Title: "", - TitleStyle: chart.Style{}, - ColorPalette: nil, - Width: 0, - Height: 0, - DPI: 0, - Background: chart.Style { - Padding: chart.Box { + c.graph = chart.Chart{ + Title: "", + TitleStyle: chart.Style{}, + ColorPalette: nil, + Width: 0, + Height: 0, + DPI: 0, + Background: chart.Style{ + Padding: chart.Box{ Top: 50, Left: 25, Right: 25, @@ -333,7 +331,7 @@ func New() *Chart { YAxis: chart.YAxis{}, YAxisSecondary: chart.YAxis{}, Font: nil, - Series: []chart.Series{}, // c.timeSeries1, c.annotation }, // , c.timeSeries2}, + Series: []chart.Series{}, // c.timeSeries1, c.annotation }, // , c.timeSeries2}, Elements: nil, Log: nil, } @@ -368,13 +366,11 @@ func (c *Chart) ProcessGraphData(table *Table) error { // continue // } - // if req.Title == "" { // req.Title = cell.(string) // c.SetTitle(cell.(string)) // } - // if t.graph.searchName == "" { if c.req.NameColumn != nil { // cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.NameColumn}) @@ -403,7 +399,6 @@ func (c *Chart) ProcessGraphData(table *Table) error { } // } - // Get units if c.req.DataUnit == nil { if c.req.UnitsColumn != nil { @@ -436,7 +431,6 @@ func (c *Chart) ProcessGraphData(table *Table) error { } } - // cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.TimeColumn}) cellType, cell, c.Error = table.GetCell(row, *c.req.TimeColumn) if c.Error != nil { @@ -454,29 +448,29 @@ func (c *Chart) ProcessGraphData(table *Table) error { // } // times = append(times, val.First().IsTypeDateTime()) switch cellType { - case valueTypes.TypeUnitValue: - var tim time.Time - tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(valueTypes.UnitValue).String(), time.Local) // @TODO - May have to revisit this! - if c.Error != nil { - continue - } - times = append(times, tim) - case "string": - var tim time.Time - tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(string), time.Local) // @TODO - May have to revisit this! - if c.Error != nil { - continue - } - times = append(times, tim) - case valueTypes.TypeDateTime: - times = append(times, cell.(valueTypes.DateTime).Time) - default: - var tim time.Time - tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, fmt.Sprintf("%s", cell), time.Local) // @TODO - May have to revisit this! - if c.Error != nil { - continue - } - times = append(times, tim) + case valueTypes.TypeUnitValue: + var tim time.Time + tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(valueTypes.UnitValue).String(), time.Local) // @TODO - May have to revisit this! + if c.Error != nil { + continue + } + times = append(times, tim) + case "string": + var tim time.Time + tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(string), time.Local) // @TODO - May have to revisit this! + if c.Error != nil { + continue + } + times = append(times, tim) + case valueTypes.TypeDateTime: + times = append(times, cell.(valueTypes.DateTime).Time) + default: + var tim time.Time + tim, c.Error = time.ParseInLocation(DateTimeSearchLayout, fmt.Sprintf("%s", cell), time.Local) // @TODO - May have to revisit this! + if c.Error != nil { + continue + } + times = append(times, tim) } // cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.ValueColumn}) @@ -537,38 +531,38 @@ func (c *Chart) ProcessGraphData(table *Table) error { break } - c.timeSeries1.Style = chart.Style { + c.timeSeries1.Style = chart.Style{ StrokeColor: drawing.ColorBlue, FillColor: drawing.ColorBlue.WithAlpha(64), } - c.minSeries = &chart.MinSeries { + c.minSeries = &chart.MinSeries{ Name: "Min", - Style: chart.Style { + Style: chart.Style{ // StrokeColor: chart.ColorAlternateGray, // StrokeColor: drawing.ColorBlue, // FillColor: drawing.ColorBlue.WithAlpha(50), StrokeColor: drawing.ColorBlue, StrokeDashArray: []float64{5.0, 5.0}, - DotWidth: 0.5, + DotWidth: 0.5, }, InnerSeries: c.timeSeries1, } - c.maxSeries = &chart.MaxSeries { + c.maxSeries = &chart.MaxSeries{ Name: "Max", - Style: chart.Style { + Style: chart.Style{ // StrokeColor: chart.ColorAlternateGray, // StrokeColor: drawing.ColorGreen, // FillColor: drawing.ColorGreen.WithAlpha(64), StrokeColor: drawing.ColorBlue, StrokeDashArray: []float64{5.0, 5.0}, - DotWidth: 1.0, + DotWidth: 1.0, }, InnerSeries: c.timeSeries1, } - c.graph.Series = []chart.Series { + c.graph.Series = []chart.Series{ c.timeSeries1, // c.annotation, c.minSeries, @@ -653,7 +647,7 @@ func (c *Chart) SetRangeY(min *float64, max *float64) bool { break } - c.graph.YAxis.Range = &chart.ContinuousRange { + c.graph.YAxis.Range = &chart.ContinuousRange{ Min: *min, Max: *max, Domain: 0, @@ -706,12 +700,12 @@ func (c *Chart) SetX(name string, values ...time.Time) error { break } - c.graph.XAxis = chart.XAxis { + c.graph.XAxis = chart.XAxis{ Name: name, NameStyle: chart.Style{}, Style: chart.Style{}, ValueFormatter: chart.TimeValueFormatterWithFormat(DateTimeLayout), - Range: &chart.ContinuousRange { + Range: &chart.ContinuousRange{ Min: 0, Max: 0, Domain: 0, diff --git a/iSolarCloud/api/GoStruct/output/struct_json.go b/iSolarCloud/api/GoStruct/output/struct_json.go index 743b6b00a..4b64499a2 100644 --- a/iSolarCloud/api/GoStruct/output/struct_json.go +++ b/iSolarCloud/api/GoStruct/output/struct_json.go @@ -1,16 +1,15 @@ package output import ( - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "encoding/json" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" "github.com/MickMake/GoUnify/Only" ) - type Json string - func (req Json) String() string { return string(req) } diff --git a/iSolarCloud/api/GoStruct/output/struct_table.go b/iSolarCloud/api/GoStruct/output/struct_table.go index d8fbd1879..4340a9764 100644 --- a/iSolarCloud/api/GoStruct/output/struct_table.go +++ b/iSolarCloud/api/GoStruct/output/struct_table.go @@ -1,22 +1,23 @@ package output import ( - "GoSungrow/iSolarCloud/api/GoStruct/gojson" - "GoSungrow/tablib" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "reflect" "sort" "strings" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/gojson" + "github.com/MickMake/GoSungrow/tablib" + "github.com/MickMake/GoUnify/Only" ) + // "go.pennock.tech/tabular/auto" // "github.com/olekukonko/tablewriter" // "github.com/agrison/go-tablib" // "github.com/jbub/tabular" - type Tables map[string]Table func NewTables() Tables { @@ -34,7 +35,6 @@ func (t *Tables) Sort() []string { return sorted } - type Table struct { name string filePrefix string @@ -47,7 +47,7 @@ type Table struct { graphFilter string Error error - tablib *tablib.Dataset + tablib *tablib.Dataset // tabular tabular.RenderTable // tablewriter *tablewriter.Table // buf *bytes.Buffer @@ -57,17 +57,17 @@ type Table struct { func NewTable(headers ...string) Table { // buf := new(bytes.Buffer) - t := Table { - filePrefix: "", - title: "", - tablib: tablib.NewDataset(headers), + t := Table{ + filePrefix: "", + title: "", + tablib: tablib.NewDataset(headers), // tabular: tabular.New("utf8-heavy"), // tablewriter: tablewriter.NewWriter(buf), // buf: buf, // headers: []string{}, // method: MethodTablib, - Error: nil, + Error: nil, } t.tablib.SetAlign(tablib.AlignLeft) @@ -431,7 +431,6 @@ func (t *Table) GetName() string { return t.name } - func (t *Table) Output() error { for range Only.Once { if t == nil { @@ -439,40 +438,40 @@ func (t *Table) Output() error { } switch { - case t.OutputType.IsNone(): + case t.OutputType.IsNone(): - case t.OutputType.IsTable(): - t.Error = t.WriteTable() + case t.OutputType.IsTable(): + t.Error = t.WriteTable() - case t.OutputType.IsList(): - t.Error = t.WriteList() + case t.OutputType.IsList(): + t.Error = t.WriteList() - case t.OutputType.IsCsv(): - t.Error = t.WriteCsv() + case t.OutputType.IsCsv(): + t.Error = t.WriteCsv() - case t.OutputType.IsXML(): - t.Error = t.WriteXml() + case t.OutputType.IsXML(): + t.Error = t.WriteXml() - case t.OutputType.IsXLSX(): - t.Error = t.WriteXLSX() + case t.OutputType.IsXLSX(): + t.Error = t.WriteXLSX() - case t.OutputType.IsRaw(): - t.Error = t.WriteRaw() + case t.OutputType.IsRaw(): + t.Error = t.WriteRaw() - case t.OutputType.IsJson(): - t.Error = t.WriteJson() + case t.OutputType.IsJson(): + t.Error = t.WriteJson() - case t.OutputType.IsGraph(): - t.Error = t.CreateGraph() + case t.OutputType.IsGraph(): + t.Error = t.CreateGraph() - case t.OutputType.IsMarkDown(): - t.Error = t.WriteMarkDown() + case t.OutputType.IsMarkDown(): + t.Error = t.WriteMarkDown() - case t.OutputType.IsStruct(): - t.Error = t.WriteStruct() + case t.OutputType.IsStruct(): + t.Error = t.WriteStruct() - default: - t.Error = t.WriteTable() + default: + t.Error = t.WriteTable() } } @@ -531,7 +530,6 @@ func (t *Table) WriteList() error { return t.Error } - func (t *Table) AsCsv() string { var ret string for range Only.Once { @@ -573,7 +571,6 @@ func (t *Table) WriteCsv() error { return t.Error } - func (t *Table) AsXml() string { var ret string for range Only.Once { @@ -615,7 +612,6 @@ func (t *Table) WriteXml() error { return t.Error } - func (t *Table) AsXLSX() string { var ret string for range Only.Once { @@ -657,7 +653,6 @@ func (t *Table) WriteXLSX() error { return t.Error } - func (t *Table) AsJson() string { return string(t.raw) } @@ -678,7 +673,6 @@ func (t *Table) WriteJson() error { return t.Error } - func (t *Table) AsRaw() string { return string(t.json) } @@ -703,7 +697,6 @@ func (t *Table) WriteRaw() error { return t.Error } - func (t *Table) AsStruct() string { return string(t.json) } @@ -739,7 +732,6 @@ func (t *Table) WriteStruct() error { return t.Error } - func (t *Table) AsMarkDown() string { var ret string for range Only.Once { @@ -770,7 +762,7 @@ func (t *Table) WriteMarkDown() error { } if t.saveAsFile { - _, _ = fmt.Fprintf(os.Stderr,"# %s\n", t.title) + _, _ = fmt.Fprintf(os.Stderr, "# %s\n", t.title) t.filePrefix += "." + StringTypeMarkDown t.Error = t.writeFile(t.AsMarkDown(), DefaultFileMode) break diff --git a/iSolarCloud/api/GoStruct/reflection/funcs.go b/iSolarCloud/api/GoStruct/reflection/funcs.go index d414cce6d..6e23532d5 100644 --- a/iSolarCloud/api/GoStruct/reflection/funcs.go +++ b/iSolarCloud/api/GoStruct/reflection/funcs.go @@ -1,16 +1,16 @@ package reflection import ( - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "crypto/md5" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "reflect" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) const AnyIndex = -1 @@ -24,28 +24,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, ".") } @@ -94,12 +94,12 @@ func GetStringFromArray(ref interface{}, index int, name string, intSize int, da v := vo.Index(i).Interface() ivo := reflect.ValueOf(v) switch ivo.Kind() { - case reflect.Struct: - ret = GetStringFromStruct(v, name, intSize, dateFormat) - case reflect.Map: - ret = GetStringFromMap(v, name, intSize, dateFormat) - default: - // Don't descend anything else. + case reflect.Struct: + ret = GetStringFromStruct(v, name, intSize, dateFormat) + case reflect.Map: + ret = GetStringFromMap(v, name, intSize, dateFormat) + default: + // Don't descend anything else. } if ret != "" { break @@ -116,18 +116,18 @@ func GetStringFromArray(ref interface{}, index int, name string, intSize int, da if l > 1 { break } - index = l - 1 // @TODO - Hack fixup! + index = l - 1 // @TODO - Hack fixup! } v := vo.Index(index).Interface() ivo := reflect.ValueOf(v) switch ivo.Kind() { - case reflect.Struct: - ret = GetStringFromStruct(v, name, intSize, dateFormat) - case reflect.Map: - ret = GetStringFromMap(v, name, intSize, dateFormat) - default: - // Don't descend anything else. + case reflect.Struct: + ret = GetStringFromStruct(v, name, intSize, dateFormat) + case reflect.Map: + ret = GetStringFromMap(v, name, intSize, dateFormat) + default: + // Don't descend anything else. } } @@ -190,7 +190,6 @@ func GetStringFromMap(ref interface{}, name string, intSize int, dateFormat stri return ret } - func GetJsonTag(fieldTo reflect.StructField) string { var ret string @@ -212,25 +211,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 } + } } } @@ -268,7 +267,6 @@ 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 { @@ -330,7 +328,6 @@ func SetFrom(to interface{}, from interface{}) error { return err } - // GetArea Return an Area name if we are given an Area or EndPoint struct. func GetArea(trim string, v interface{}) string { var ret string @@ -409,7 +406,6 @@ func HelpOptions(ref interface{}) string { return ret } - func GetStructName(v interface{}) (string, string) { var area string var endpoint string diff --git a/iSolarCloud/api/GoStruct/struct_reflect.go b/iSolarCloud/api/GoStruct/struct_reflect.go index 66489dcfe..4a9c8630d 100644 --- a/iSolarCloud/api/GoStruct/struct_reflect.go +++ b/iSolarCloud/api/GoStruct/struct_reflect.go @@ -2,106 +2,106 @@ package GoStruct import ( - "GoSungrow/iSolarCloud/api/GoStruct/reflection" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "reflect" "strconv" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type DataTags struct { - Endpoint EndPointPath `json:"endpoint,omitempty"` + Endpoint EndPointPath `json:"endpoint,omitempty"` - Required bool `json:"required"` + Required bool `json:"required"` - Json string `json:"json,omitempty"` + 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"` + 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"` + PointUpdateFreq string `json:"point_update_freq,omitempty"` + PointValueType string `json:"point_value_type,omitempty"` - PointAliasTo string `json:"point_alias_to,omitempty"` - PointVirtual bool `json:"point_virtual,omitempty"` - PointVirtualShift int64 `json:"point_virtual_shift,omitempty"` + PointAliasTo string `json:"point_alias_to,omitempty"` + PointVirtual bool `json:"point_virtual,omitempty"` + PointVirtualShift int64 `json:"point_virtual_shift,omitempty"` - PointTimestamp time.Time `json:"point_timestamp,omitempty"` - PointTimestampFrom string `json:"point_timestamp_from,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"` - PointVariableUnit bool `json:"point_variable_unit,omitempty"` + PointUnit string `json:"point_unit,omitempty"` + PointUnitFrom string `json:"point_unit_from,omitempty"` + PointUnitFromParent string `json:"point_unit_from_parent,omitempty"` + PointVariableUnit bool `json:"point_variable_unit,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"` + 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"` - - PointIcon string `json:"point_icon,omitempty"` - - PointIgnore bool `json:"point_ignore,omitempty"` - PointIgnoreZero bool `json:"point_ignore_zero,omitempty"` - PointIgnoreIfNil string `json:"point_ignore_if_nil,omitempty"` - PointIgnoreIfChildFromNil 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"` - PointListFlatten bool `json:"point_list_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"` - DataTablePivot bool `json:"data_table_pivot,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"` - DataTableIndex bool `json:"data_table_show_index,omitempty"` - DataTableIndexNames []string `json:"data_table_index_names,omitempty"` - DataTableSortOn string `json:"data_table_sort_on,omitempty"` - DataTableIndexTitle string `json:"data_table_index_title,omitempty"` - - ValueType string `json:"value_type,omitempty"` - ValueKind string `json:"value_kind,omitempty"` + PointNameDateFormat string `json:"point_name_date_format,omitempty"` + + PointIcon string `json:"point_icon,omitempty"` + + PointIgnore bool `json:"point_ignore,omitempty"` + PointIgnoreZero bool `json:"point_ignore_zero,omitempty"` + PointIgnoreIfNil string `json:"point_ignore_if_nil,omitempty"` + PointIgnoreIfChildFromNil 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"` + PointListFlatten bool `json:"point_list_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"` + DataTablePivot bool `json:"data_table_pivot,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"` + DataTableIndex bool `json:"data_table_show_index,omitempty"` + DataTableIndexNames []string `json:"data_table_index_names,omitempty"` + DataTableSortOn string `json:"data_table_sort_on,omitempty"` + DataTableIndexTitle string `json:"data_table_index_title,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:"-"` - PointListFlatten string `json:"-"` - PointVariableUnit string `json:"-"` - PointVirtual string `json:"-"` - PointVirtualShift string `json:"-"` - DataTable string `json:"-"` - DataTableChild string `json:"-"` - DataTablePivot string `json:"-"` - DataTableMerge string `json:"-"` - DataTableIndex string `json:"-"` - DataTableIndexNames string `json:"-"` + Required string `json:"-"` + PointIdReplace string `json:"-"` + PointIgnore string `json:"-"` + PointIgnoreZero string `json:"-"` + PointArrayFlatten string `json:"-"` + PointListFlatten string `json:"-"` + PointVariableUnit string `json:"-"` + PointVirtual string `json:"-"` + PointVirtualShift string `json:"-"` + DataTable string `json:"-"` + DataTableChild string `json:"-"` + DataTablePivot string `json:"-"` + DataTableMerge string `json:"-"` + DataTableIndex string `json:"-"` + DataTableIndexNames string `json:"-"` } //goland:noinspection GoMixedReceiverTypes @@ -119,7 +119,7 @@ func (ds DataTags) String() string { // GetTags - func (ds *DataTags) GetTags(fieldTo reflect.StructField, fieldVo reflect.Value) *DataTags { -// func (ds *DataTags) GetTags(parent *Reflect, current *Reflect, child *Reflect, fieldTo reflect.StructField, fieldVo reflect.Value) *DataTags { + // func (ds *DataTags) GetTags(parent *Reflect, current *Reflect, child *Reflect, fieldTo reflect.StructField, fieldVo reflect.Value) *DataTags { var ret *DataTags // , fieldTo reflect.StructField, fieldVo reflect.Value for range Only.Once { @@ -133,31 +133,31 @@ func (ds *DataTags) GetTags(fieldTo reflect.StructField, fieldVo reflect.Value) valueType = fieldTo.Type.String() } - *ds = DataTags { - Endpoint: EndPointPath{}, + *ds = DataTags{ + Endpoint: EndPointPath{}, - Json: reflection.GetJsonTag(fieldTo), + Json: reflection.GetJsonTag(fieldTo), PointDevice: fieldTo.Tag.Get(PointDevice), PointDeviceFrom: fieldTo.Tag.Get(PointDeviceFrom), PointDeviceFromParent: fieldTo.Tag.Get(PointDeviceFromParent), - PointId: fieldTo.Tag.Get(PointId), + PointId: fieldTo.Tag.Get(PointId), - PointTimestampFrom: fieldTo.Tag.Get(PointTimestampFrom), + PointTimestampFrom: fieldTo.Tag.Get(PointTimestampFrom), - PointGroupName: fieldTo.Tag.Get(PointGroupName), - PointGroupNameFrom: fieldTo.Tag.Get(PointGroupNameFrom), + 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), + 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), - PointIcon: fieldTo.Tag.Get(PointIcon), + PointIcon: fieldTo.Tag.Get(PointIcon), - PointUpdateFreq: fieldTo.Tag.Get(PointUpdateFreq), + PointUpdateFreq: fieldTo.Tag.Get(PointUpdateFreq), PointValueType: fieldTo.Tag.Get(PointValueType), PointValueReplace: fieldTo.Tag.Get(PointValueReplace), @@ -165,41 +165,41 @@ func (ds *DataTags) GetTags(fieldTo reflect.StructField, fieldVo reflect.Value) ValueType: valueType, ValueKind: fieldVo.Kind().String(), - PointUnit: fieldTo.Tag.Get(PointUnit), - PointUnitFrom: fieldTo.Tag.Get(PointUnitFrom), - PointUnitFromParent: fieldTo.Tag.Get(PointUnitFromParent), + PointUnit: fieldTo.Tag.Get(PointUnit), + PointUnitFrom: fieldTo.Tag.Get(PointUnitFrom), + PointUnitFromParent: fieldTo.Tag.Get(PointUnitFromParent), - PointAliasTo: fieldTo.Tag.Get(PointAliasTo), + PointAliasTo: fieldTo.Tag.Get(PointAliasTo), // PointVirtual: fieldTo.Tag.Get(PointVirtual), PointIgnoreIfNil: fieldTo.Tag.Get(PointIgnoreIfNil), PointIgnoreIfChildFromNil: fieldTo.Tag.Get(PointIgnoreIfChildFromNil), - PointSplitOn: fieldTo.Tag.Get(PointSplitOn), - PointSplitOnType: fieldTo.Tag.Get(PointSplitOnType), + 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), - DataTableIndexTitle: fieldTo.Tag.Get(DataTableIndexTitle), + DataTableId: fieldTo.Tag.Get(DataTableId), + DataTableName: fieldTo.Tag.Get(DataTableName), + DataTableTitle: fieldTo.Tag.Get(DataTableTitle), + DataTableSortOn: fieldTo.Tag.Get(DataTableSortOn), + DataTableIndexTitle: fieldTo.Tag.Get(DataTableIndexTitle), // DataTableIndexNames: fieldTo.Tag.Get(DataTableIndexNames), - 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), - PointListFlatten: fieldTo.Tag.Get(PointListFlatten), - PointVariableUnit: fieldTo.Tag.Get(PointVariableUnit), - PointVirtual: fieldTo.Tag.Get(PointVirtual), - PointVirtualShift: fieldTo.Tag.Get(PointVirtualShift), - DataTable: fieldTo.Tag.Get(IsDataTable), - DataTableChild: fieldTo.Tag.Get(DataTableChild), - DataTablePivot: fieldTo.Tag.Get(DataTablePivot), - DataTableMerge: fieldTo.Tag.Get(DataTableMerge), - DataTableIndex: fieldTo.Tag.Get(DataTableIndex), + 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), + PointListFlatten: fieldTo.Tag.Get(PointListFlatten), + PointVariableUnit: fieldTo.Tag.Get(PointVariableUnit), + PointVirtual: fieldTo.Tag.Get(PointVirtual), + PointVirtualShift: fieldTo.Tag.Get(PointVirtualShift), + DataTable: fieldTo.Tag.Get(IsDataTable), + DataTableChild: fieldTo.Tag.Get(DataTableChild), + DataTablePivot: fieldTo.Tag.Get(DataTablePivot), + DataTableMerge: fieldTo.Tag.Get(DataTableMerge), + DataTableIndex: fieldTo.Tag.Get(DataTableIndex), DataTableIndexNames: fieldTo.Tag.Get(DataTableIndexNames), }, } @@ -223,12 +223,12 @@ func (ds *DataTags) UpdateTags(parent *Reflect, current *Reflect) *DataTags { } switch ds.StrBool.PointIgnoreZero { - case "false": - ds.PointIgnoreZero = false - case "true": - ds.PointIgnoreZero = true - default: - ds.PointIgnoreZero = true + case "false": + ds.PointIgnoreZero = false + case "true": + ds.PointIgnoreZero = true + default: + ds.PointIgnoreZero = true } ds.Required = false @@ -352,20 +352,20 @@ func (ds *DataTags) UpdateTags(parent *Reflect, current *Reflect) *DataTags { } 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 + 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 @@ -415,29 +415,29 @@ func (ds *DataTags) SetFrom(from *DataTags) error { } switch FieldToFrom.Type.String() { // FieldVoFrom.Kind().String() - case "bool": - FieldVoTo.SetBool(FieldVoFrom.Bool()) + case "bool": + FieldVoTo.SetBool(FieldVoFrom.Bool()) - case "string": - // if FieldVoSrc.String() == "" { - // break - // } - FieldVoTo.SetString(FieldVoFrom.String()) + case "string": + // if FieldVoSrc.String() == "" { + // break + // } + FieldVoTo.SetString(FieldVoFrom.String()) - case "GoStruct.EndPointPath": - // We're not updating this field. + case "GoStruct.EndPointPath": + // We're not updating this field. - case "time.Time": - // We're not updating this field. + case "time.Time": + // We're not updating this field. - case "GoStruct.tagStrings": - // We're not updating this field. + case "GoStruct.tagStrings": + // We're not updating this field. - case "[]string": - // We're not updating this field. + case "[]string": + // 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", + 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()) @@ -476,7 +476,6 @@ func StrSet(src string, dst string) string { return src } - // Reflect - Combines all the common reflect work into one package // So we don't have to keep repeating ourselves. type Reflect struct { @@ -486,9 +485,9 @@ type Reflect struct { ChildReflect []*Reflect ChildReflectMap map[string]*Reflect - Valid bool - DataStructure DataTags - GoStructs struct { + Valid bool + DataStructure DataTags + GoStructs struct { Parent *DataTags Current *DataTags } @@ -502,14 +501,14 @@ type Reflect struct { InterfaceValue interface{} IsStart bool - Index int - Length int - FieldName string - Kind reflect.Kind - TypeOf reflect.Type - ValueOf reflect.Value - FieldTo reflect.StructField - FieldVo reflect.Value + Index int + Length int + FieldName string + Kind reflect.Kind + TypeOf reflect.Type + ValueOf reflect.Value + FieldTo reflect.StructField + FieldVo reflect.Value } type ReflectMap map[string]Reflect @@ -535,32 +534,60 @@ func (r Reflect) String() string { r.Kind.String(), ) switch r.Kind { - case reflect.Array: - fallthrough - case reflect.Map: - fallthrough - case reflect.Slice: - ret += fmt.Sprintf(" Length:%d", - r.Length, - ) + case reflect.Array: + fallthrough + case reflect.Map: + fallthrough + case reflect.Slice: + ret += fmt.Sprintf(" Length:%d", + r.Length, + ) } ret += "\t- " - if r.IsOk { ret += "IsOk "} - if r.IsNil { ret += "IsNil "} - if r.isUnknown { ret += "IsUnknown "} - if r.IsExported { ret += "IsExported "} - - if r.DataStructure.DataTable { ret += "DataTable "} - if r.DataStructure.DataTableChild { ret += "DataTableChild "} - if r.DataStructure.DataTablePivot { ret += "DataTablePivot "} - if r.DataStructure.PointIdReplace { ret += "PointIdReplace "} - if r.DataStructure.PointArrayFlatten { ret += "PointArrayFlatten "} - if r.DataStructure.PointListFlatten { ret += "PointListFlatten "} - if r.DataStructure.PointVariableUnit { ret += "PointVariableUnit "} - if r.DataStructure.PointVirtual { ret += "PointVirtual "} - if r.DataStructure.PointIgnore { ret += "PointIgnore "} - if r.DataStructure.PointIgnoreZero { ret += "PointIgnoreZero "} + if r.IsOk { + ret += "IsOk " + } + if r.IsNil { + ret += "IsNil " + } + if r.isUnknown { + ret += "IsUnknown " + } + if r.IsExported { + ret += "IsExported " + } + + if r.DataStructure.DataTable { + ret += "DataTable " + } + if r.DataStructure.DataTableChild { + ret += "DataTableChild " + } + if r.DataStructure.DataTablePivot { + ret += "DataTablePivot " + } + if r.DataStructure.PointIdReplace { + ret += "PointIdReplace " + } + if r.DataStructure.PointArrayFlatten { + ret += "PointArrayFlatten " + } + if r.DataStructure.PointListFlatten { + ret += "PointListFlatten " + } + if r.DataStructure.PointVariableUnit { + ret += "PointVariableUnit " + } + if r.DataStructure.PointVirtual { + ret += "PointVirtual " + } + if r.DataStructure.PointIgnore { + ret += "PointIgnore " + } + if r.DataStructure.PointIgnoreZero { + ret += "PointIgnoreZero " + } } return ret } @@ -598,28 +625,28 @@ func (r *Reflect) IsUnknown() bool { func (r *Reflect) Init(parent interface{}, current interface{}, name EndPointPath) { for range Only.Once { - r.ParentReflect = &Reflect { - ParentReflect: nil, - CurrentReflect: r, - ChildReflect: nil, + r.ParentReflect = &Reflect{ + ParentReflect: nil, + CurrentReflect: r, + ChildReflect: nil, ChildReflectMap: make(map[string]*Reflect, 0), - Valid: false, - DataStructure: DataTags{}, - Interface: parent, - IsNil: false, - IsExported: true, - isUnknown: false, - IsOk: true, - Value: valueTypes.UnitValues{}, - InterfaceValue: parent, - Index: 0, - Length: 0, - FieldName: "", - Kind: 0, - TypeOf: nil, - ValueOf: reflect.Value{}, - FieldTo: reflect.StructField{}, - FieldVo: reflect.Value{}, + Valid: false, + DataStructure: DataTags{}, + Interface: parent, + IsNil: false, + IsExported: true, + isUnknown: false, + IsOk: true, + Value: valueTypes.UnitValues{}, + InterfaceValue: parent, + Index: 0, + Length: 0, + FieldName: "", + Kind: 0, + TypeOf: nil, + ValueOf: reflect.Value{}, + FieldTo: reflect.StructField{}, + FieldVo: reflect.Value{}, } r.CurrentReflect = r @@ -643,67 +670,67 @@ func (r *Reflect) Init(parent interface{}, current interface{}, name EndPointPat r.Length = valueTypes.IgnoreLength switch r.Kind { - case reflect.Struct: - r.Length = r.ValueOf.NumField() - r.FieldTo = reflect.StructField{} - r.FieldVo = reflect.Value{} - r.IsExported = r.FieldTo.IsExported() - r.FieldName = r.FieldTo.Name - - r.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) - r.SetGoStructOptions(1) - r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) - - r.InterfaceValue = current - r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue( - r.InterfaceValue, "", r.DataStructure.PointUnit, - r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat) - r.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) - - case reflect.Slice: - fallthrough - case reflect.Array: - r.Length = r.ValueOf.Len() - r.FieldTo = reflect.StructField{} - r.FieldVo = reflect.Value{} - r.IsExported = true - r.FieldName = r.FieldTo.Name - r.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) - r.SetGoStructOptions(2) - r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) - if r.Length == 0 { - r.DataStructure.PointIdReplace = true - } + case reflect.Struct: + r.Length = r.ValueOf.NumField() + r.FieldTo = reflect.StructField{} + r.FieldVo = reflect.Value{} + r.IsExported = r.FieldTo.IsExported() + r.FieldName = r.FieldTo.Name + + r.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) + r.SetGoStructOptions(1) + r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) + + r.InterfaceValue = current + r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue( + r.InterfaceValue, "", r.DataStructure.PointUnit, + r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat) + r.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) + + case reflect.Slice: + fallthrough + case reflect.Array: + r.Length = r.ValueOf.Len() + r.FieldTo = reflect.StructField{} + r.FieldVo = reflect.Value{} + r.IsExported = true + r.FieldName = r.FieldTo.Name + r.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) + r.SetGoStructOptions(2) + r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) + if r.Length == 0 { + r.DataStructure.PointIdReplace = true + } - 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.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) - - case reflect.Map: - r.Length = len(r.ValueOf.MapKeys()) - r.FieldTo = reflect.StructField{} - r.FieldVo = reflect.Value{} - r.IsExported = true - r.FieldName = r.FieldTo.Name - // 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.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) - r.SetGoStructOptions(1) - r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) - - 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.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) + 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.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) + + case reflect.Map: + r.Length = len(r.ValueOf.MapKeys()) + r.FieldTo = reflect.StructField{} + r.FieldVo = reflect.Value{} + r.IsExported = true + r.FieldName = r.FieldTo.Name + // 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.DataStructure.GetTags(reflect.StructField{}, reflect.Value{}) // , r.FieldTo, r.FieldVo) + r.SetGoStructOptions(1) + r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect) + + 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.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) } // r.SetGoStructOptions() @@ -724,19 +751,19 @@ func (r *Reflect) SetByIndex(parent *Reflect, current *Reflect, index int, index } switch current.TypeOf.Kind() { - case reflect.Struct: - if !current.TypeOf.Field(index).IsExported() { - return - } - r.Interface = current.ValueOf.Field(index).Interface() + case reflect.Struct: + if !current.TypeOf.Field(index).IsExported() { + return + } + r.Interface = current.ValueOf.Field(index).Interface() - case reflect.Slice: - fallthrough - case reflect.Array: - r.Interface = current.ValueOf.Index(index).Interface() + case reflect.Slice: + fallthrough + case reflect.Array: + r.Interface = current.ValueOf.Index(index).Interface() - case reflect.Map: - r.Interface = current.ValueOf.MapIndex(indexName).Interface() + case reflect.Map: + r.Interface = current.ValueOf.MapIndex(indexName).Interface() } r.isUnknown = valueTypes.IsUnknownStruct(r.Interface, true) @@ -773,150 +800,145 @@ func (r *Reflect) SetByIndex(parent *Reflect, current *Reflect, index int, index } switch r.Kind { - case reflect.Struct: - r.Length = r.ValueOf.NumField() + case reflect.Struct: + r.Length = r.ValueOf.NumField() - case reflect.Slice: - fallthrough - case reflect.Array: - r.Length = r.ValueOf.Len() + case reflect.Slice: + fallthrough + case reflect.Array: + r.Length = r.ValueOf.Len() - case reflect.Map: - r.Length = len(r.ValueOf.MapKeys()) + case reflect.Map: + r.Length = len(r.ValueOf.MapKeys()) - default: - r.Length = valueTypes.IgnoreLength + default: + r.Length = valueTypes.IgnoreLength } r.Valid = true 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) - current.ChildReflect = append(current.ChildReflect, r) - current.ChildReflectMap[r.FieldName] = r - - // DataStructure - r.DataStructure.GetTags(r.FieldTo, r.FieldVo) - r.SetGoStructOptions(1) - r.DataStructure.UpdateTags(parent, current) - - // Value - 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.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) - - case reflect.Slice: - fallthrough - case reflect.Array: - r.FieldTo = reflect.StructField{} - if current.Kind == reflect.Struct { - r.FieldTo = current.FieldTo // Point to the parent if a struct. - } - r.IsExported = true - r.FieldVo = current.ValueOf.Index(index) - r.FieldName = current.FieldName + ":" + strconv.Itoa(index) // r.FieldVo.String() - r.FieldPath = r.CurrentReflect.FieldPath.Copy() - r.FieldPath.Append("[" + strconv.Itoa(r.Index) + "]") - current.ChildReflect = append(current.ChildReflect, r) - current.ChildReflectMap[r.FieldName] = r - - // DataStructure - r.DataStructure.GetTags(r.FieldTo, r.FieldVo) - if r.DataStructure.PointUnit == "" { - // Only on arrays and maps. - if current.DataStructure.PointUnit != "" { - r.DataStructure.PointUnit = current.DataStructure.PointUnit - } - } - if r.DataStructure.PointUnitFromParent == "" { - // Only on arrays and maps. - if current.DataStructure.PointUnitFrom != "" { - r.DataStructure.PointUnitFromParent = current.DataStructure.PointUnitFrom - } - } - r.SetGoStructOptions(2) - r.DataStructure.UpdateTags(parent, current) - if r.Length == 0 { - r.DataStructure.PointIdReplace = true + 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) + current.ChildReflect = append(current.ChildReflect, r) + current.ChildReflectMap[r.FieldName] = r + + // DataStructure + r.DataStructure.GetTags(r.FieldTo, r.FieldVo) + r.SetGoStructOptions(1) + r.DataStructure.UpdateTags(parent, current) + + // Value + 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.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) + + case reflect.Slice: + fallthrough + case reflect.Array: + r.FieldTo = reflect.StructField{} + if current.Kind == reflect.Struct { + r.FieldTo = current.FieldTo // Point to the parent if a struct. + } + r.IsExported = true + r.FieldVo = current.ValueOf.Index(index) + r.FieldName = current.FieldName + ":" + strconv.Itoa(index) // r.FieldVo.String() + r.FieldPath = r.CurrentReflect.FieldPath.Copy() + r.FieldPath.Append("[" + strconv.Itoa(r.Index) + "]") + current.ChildReflect = append(current.ChildReflect, r) + current.ChildReflectMap[r.FieldName] = r + + // DataStructure + r.DataStructure.GetTags(r.FieldTo, r.FieldVo) + if r.DataStructure.PointUnit == "" { + // Only on arrays and maps. + if current.DataStructure.PointUnit != "" { + r.DataStructure.PointUnit = current.DataStructure.PointUnit } - r.DataStructure.Json = current.DataStructure.PointId - r.DataStructure.PointId = current.DataStructure.PointId - 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 + } + if r.DataStructure.PointUnitFromParent == "" { + // Only on arrays and maps. + if current.DataStructure.PointUnitFrom != "" { + r.DataStructure.PointUnitFromParent = current.DataStructure.PointUnitFrom } - - // Value - 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.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) - - case reflect.Map: - r.FieldTo = reflect.StructField{} - if current.Kind == reflect.Struct { - r.FieldTo = current.FieldTo // Point to the parent if a struct. + } + r.SetGoStructOptions(2) + r.DataStructure.UpdateTags(parent, current) + if r.Length == 0 { + r.DataStructure.PointIdReplace = true + } + r.DataStructure.Json = current.DataStructure.PointId + r.DataStructure.PointId = current.DataStructure.PointId + if !r.isUnknown { + f := "%d" + if current.Length > 0 { + f = fmt.Sprintf("%%.%dd", valueTypes.SizeOfInt(current.Length)) } - r.IsExported = true - r.FieldVo = current.ValueOf.MapIndex(indexName) - name := valueTypes.AnyToValueString(indexName.Interface(), valueTypes.IgnoreLength, "") // map key could be anything. - r.FieldName = name // current.FieldName + ":" + indexName.String() - - - - - - r.FieldPath = r.CurrentReflect.FieldPath.Copy() - r.FieldPath.Append("[" + name + "]") // indexName.String() - current.ChildReflect = append(current.ChildReflect, r) - current.ChildReflectMap[r.FieldName] = r + // f = fmt.Sprintf(f, index) + r.DataStructure.Json = current.DataStructure.PointId + "_" + f + r.DataStructure.PointId = current.DataStructure.PointId + "_" + f + } - // DataStructure - r.DataStructure.GetTags(r.FieldTo, r.FieldVo) - if r.DataStructure.PointUnit == "" { - // Only on arrays and maps. - if current.DataStructure.PointUnit != "" { - r.DataStructure.PointUnit = current.DataStructure.PointUnit - } + // Value + 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.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) + + case reflect.Map: + r.FieldTo = reflect.StructField{} + if current.Kind == reflect.Struct { + r.FieldTo = current.FieldTo // Point to the parent if a struct. + } + r.IsExported = true + r.FieldVo = current.ValueOf.MapIndex(indexName) + name := valueTypes.AnyToValueString(indexName.Interface(), valueTypes.IgnoreLength, "") // map key could be anything. + r.FieldName = name // current.FieldName + ":" + indexName.String() + + r.FieldPath = r.CurrentReflect.FieldPath.Copy() + r.FieldPath.Append("[" + name + "]") // indexName.String() + current.ChildReflect = append(current.ChildReflect, r) + current.ChildReflectMap[r.FieldName] = r + + // DataStructure + r.DataStructure.GetTags(r.FieldTo, r.FieldVo) + if r.DataStructure.PointUnit == "" { + // Only on arrays and maps. + if current.DataStructure.PointUnit != "" { + r.DataStructure.PointUnit = current.DataStructure.PointUnit } - if r.DataStructure.PointUnitFromParent == "" { - // Only on arrays and maps. - if current.DataStructure.PointUnitFrom != "" { - r.DataStructure.PointUnitFromParent = current.DataStructure.PointUnitFrom - } + } + if r.DataStructure.PointUnitFromParent == "" { + // Only on arrays and maps. + if current.DataStructure.PointUnitFrom != "" { + r.DataStructure.PointUnitFromParent = current.DataStructure.PointUnitFrom } - r.SetGoStructOptions(1) - r.DataStructure.Json = name // indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String() - r.DataStructure.PointId = name // indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String() - r.DataStructure.UpdateTags(parent, current) - - // Value - 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) - r.SetUnit() - r.Value.SetDeviceId(r.DataStructure.PointDevice) + } + r.SetGoStructOptions(1) + r.DataStructure.Json = name // indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String() + r.DataStructure.PointId = name // indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String() + r.DataStructure.UpdateTags(parent, current) + // Value + 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) + r.SetUnit() + r.Value.SetDeviceId(r.DataStructure.PointDevice) - default: - r.Interface = current.Interface + default: + r.Interface = current.Interface } r.SetPointId() @@ -943,12 +965,12 @@ func (r *Reflect) SetValuePrecision(precision int) { func (r *Reflect) SetUnit() { for range Only.Once { switch { - case r.Value.GetUnit() == "": - r.Value.SetUnit(r.DataStructure.PointUnit) - default: - r.DataStructure.PointUnit = r.Value.GetUnit() - r.DataStructure.PointUnitFrom = "" - r.DataStructure.PointUnitFromParent = "" + case r.Value.GetUnit() == "": + r.Value.SetUnit(r.DataStructure.PointUnit) + default: + r.DataStructure.PointUnit = r.Value.GetUnit() + r.DataStructure.PointUnitFrom = "" + r.DataStructure.PointUnitFromParent = "" } } } @@ -993,7 +1015,6 @@ func (r *Reflect) GetValueFloat() float64 { return ret } - // SetPointId - Sets the EndPointPath based off struct tags? func (r *Reflect) SetPointId() EndPointPath { for range Only.Once { @@ -1006,117 +1027,117 @@ func (r *Reflect) SetPointId() EndPointPath { } switch { - case r.DataStructure.PointIdFromChild != "": - // PointIdFromChild - In this case points to a field within a CHILD struct. - // @TODO - This needs fixing for arrays! Will always return the first entry found instead of the correct one. - // 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, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. - if p == "" { - continue - } - pns = append(pns, p) + case r.DataStructure.PointIdFromChild != "": + // PointIdFromChild - In this case points to a field within a CHILD struct. + // @TODO - This needs fixing for arrays! Will always return the first entry found instead of the correct one. + // 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, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. + if p == "" { + continue } - 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) + 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) + } + + 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 + // al := valueTypes.SizeOfInt(r.Length) + for _, pid := range strings.Split(r.DataStructure.PointIdFrom, ".") { + // p := reflection.GetStringFromStruct(r.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. + p := reflection.GetStringFromStruct(r.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. + if p == "" { + p = reflection.GetStringFromStruct(r.CurrentReflect.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) } - if pn != "" { - r.DataStructure.Endpoint.Append(pn) - // fmt.Printf("[PointIdFromChild4] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath) + if p == "" { + continue } + pns = append(pns, p) + } - 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 - // al := valueTypes.SizeOfInt(r.Length) - for _, pid := range strings.Split(r.DataStructure.PointIdFrom, ".") { - // p := reflection.GetStringFromStruct(r.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. - p := reflection.GetStringFromStruct(r.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) // Look forward into structure. - if p == "" { - p = reflection.GetStringFromStruct(r.CurrentReflect.Interface, pid, valueTypes.IgnoreLength, r.DataStructure.PointNameDateFormat) - } - if p == "" { - continue - } - pns = append(pns, p) + if r.DataStructure.PointId != "" { + if !r.DataStructure.PointIdReplace { + 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) + } - if r.DataStructure.PointId != "" { - if !r.DataStructure.PointIdReplace { - pns = append(pns, r.DataStructure.PointId) + // 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: + // 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) } - 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) - } - - // 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: - // 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() - // } - if pn != "" { - r.DataStructure.Endpoint.Append(pn) - // fmt.Printf("[default4 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath) - } + 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() + // } + if pn != "" { + r.DataStructure.Endpoint.Append(pn) + // fmt.Printf("[default4 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath) + } } } @@ -1124,7 +1145,6 @@ func (r *Reflect) SetPointId() EndPointPath { return r.DataStructure.Endpoint } - func (r *Reflect) IsTable() bool { return r.DataStructure.DataTable } @@ -1373,17 +1393,17 @@ func (r *Reflect) IsGroup() bool { var yes bool switch { - case r == nil: - break + case r == nil: + break - case r.Kind == reflect.Map: - yes = true + case r.Kind == reflect.Map: + yes = true - case r.Kind == reflect.Array: - yes = true + case r.Kind == reflect.Array: + yes = true - case r.Kind == reflect.Slice: - yes = true + case r.Kind == reflect.Slice: + yes = true } return yes @@ -1434,7 +1454,7 @@ func GetChildGoStruct(ref interface{}, limit int) (*DataTags, *DataTags) { } var dt DataTags - dt.GetTags(fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo + dt.GetTags(fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo parent = &dt break } @@ -1457,7 +1477,7 @@ func GetChildGoStruct(ref interface{}, limit int) (*DataTags, *DataTags) { } var dt DataTags - dt.GetTags(fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo + dt.GetTags(fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo current = &dt break } @@ -1639,7 +1659,6 @@ func (r *Reflect) ValueLength() int { return r.Value.Length() } - func GetStructFields(ref interface{}) map[string]string { ret := make(map[string]string) @@ -1754,7 +1773,6 @@ func AddIntegerValues(refs ...*Reflect) int64 { return ret } - type Required []string func (r *Required) IsRequired(field string) bool { diff --git a/iSolarCloud/api/GoStruct/struct_table.go b/iSolarCloud/api/GoStruct/struct_table.go index 770fc3197..47da5f039 100644 --- a/iSolarCloud/api/GoStruct/struct_table.go +++ b/iSolarCloud/api/GoStruct/struct_table.go @@ -1,16 +1,16 @@ package GoStruct import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "sort" "strconv" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type StructTables map[string]*StructTable @@ -26,11 +26,10 @@ func (sm *StructTables) GetTableNames() []string { return ret } - type StructTable struct { - Area string - Name string - Current *Reflect + Area string + Name string + Current *Reflect MapName string Reflects ReflectArray @@ -46,12 +45,14 @@ type StructTable struct { ActualRows int ActualCols int - Debug bool - Error error + Debug bool + Error error } -func (ta *StructTable) PrintDebug(format string, args ...interface{}) { - if ta.Debug { _, _ = fmt.Fprintf(os.Stderr, format, args...) } +func (ta *StructTable) PrintDebug(format string, args ...interface{}) { + if ta.Debug { + _, _ = fmt.Fprintf(os.Stderr, format, args...) + } } func (ta *StructTable) AddRow(refs ...*Reflect) { @@ -101,7 +102,6 @@ func (ta *StructTable) Process(area string, name string, Current *Reflect) error ta.IndexTitle = ta.Current.DataStructure.DataTableIndexTitle } - ta.Rows, ta.Cols = ta.Current.CountChildren() var isPivot bool if ta.Current.DataStructure.DataTablePivot { @@ -241,25 +241,25 @@ func (ta *StructTable) GetValues() StructValues { valueKey = true } switch { - case pointName == true && deviceId == true && valueKey == true: - name = value.DeviceId() + "." + value.ValueKey() - case pointName == true && deviceId == true && valueKey == false: - name = value.DeviceId() + "." + sub.DataStructure.PointName - - case pointName == true && deviceId == false && valueKey == true: - name = value.ValueKey() - case pointName == true && deviceId == false && valueKey == false: - name = sub.DataStructure.PointName - - case pointName == false && deviceId == true && valueKey == true: - name = value.DeviceId() + "." + value.ValueKey() - case pointName == false && deviceId == true && valueKey == false: - name = "Column " + strconv.Itoa(length) - - case pointName == false && deviceId == false && valueKey == true: - name = value.ValueKey() - case pointName == false && deviceId == false && valueKey == false: - name = "Column " + strconv.Itoa(length) + case pointName == true && deviceId == true && valueKey == true: + name = value.DeviceId() + "." + value.ValueKey() + case pointName == true && deviceId == true && valueKey == false: + name = value.DeviceId() + "." + sub.DataStructure.PointName + + case pointName == true && deviceId == false && valueKey == true: + name = value.ValueKey() + case pointName == true && deviceId == false && valueKey == false: + name = sub.DataStructure.PointName + + case pointName == false && deviceId == true && valueKey == true: + name = value.DeviceId() + "." + value.ValueKey() + case pointName == false && deviceId == true && valueKey == false: + name = "Column " + strconv.Itoa(length) + + case pointName == false && deviceId == false && valueKey == true: + name = value.ValueKey() + case pointName == false && deviceId == false && valueKey == false: + name = "Column " + strconv.Itoa(length) } // if value.DeviceId() != "" { @@ -290,12 +290,12 @@ func (ta *StructTable) GetValues() StructValues { // name += " " + value.ValueKey() // } switch value.Unit() { - case "--": - case "": - default: - if !sub.DataStructure.PointVariableUnit { - name += " (" + value.Unit() + ")" - } + case "--": + case "": + default: + if !sub.DataStructure.PointVariableUnit { + name += " (" + value.Unit() + ")" + } } return name } @@ -375,7 +375,6 @@ func (ta *StructTable) GetValues() StructValues { break } - if len(ta.Reflects) == 1 { // Probs an array of values - sw we want to pivot the data. cm := make(map[string][]valueTypes.UnitValue) @@ -388,10 +387,10 @@ func (ta *StructTable) GetValues() StructValues { name := sub.DataStructure.PointName if !sub.DataStructure.PointVariableUnit { switch sub.Value.GetUnit() { - case "--": - case "": - default: - name += " (" + sub.Value.GetUnit() + ")" + case "--": + case "": + default: + name += " (" + sub.Value.GetUnit() + ")" } addCol(name) } else { @@ -436,7 +435,6 @@ func (ta *StructTable) GetValues() StructValues { break } - if ta.ShowIndex { addCol(ta.IndexTitle) } @@ -574,7 +572,7 @@ func (ta *StructTable) CreateTable() (output.Table, error) { // (output.Tables, ta.Table.SetJson(nil) ta.Table.SetRaw(nil) - ta.Table.SetGraphFilter("") // @TODO - Consider setting graph options here instead of iSolarCloud/data.go:487 + ta.Table.SetGraphFilter("") // @TODO - Consider setting graph options here instead of iSolarCloud/data.go:487 // if sgd.Options.GraphRequest.TimeColumn == nil { // for _, col := range table.GetHeaders() { @@ -610,7 +608,6 @@ func (ta *StructTable) CreateTable() (output.Table, error) { // (output.Tables, return ta.Table, ta.Error } - type ReflectArray []ReflectArrayRow type ReflectArrayRow []*Reflect @@ -634,7 +631,6 @@ func (ta *ReflectArray) GetRow(row int) ReflectArrayRow { return (*ta)[row] } - type StructValuesMap map[string]StructValues type StructValue map[string]valueTypes.UnitValue @@ -658,7 +654,6 @@ func (ta *StructValues) GetCell(row int, col string) valueTypes.UnitValue { return ret } - func sortMapByValues(data map[string]int) []string { var ret []string keys := make([]string, 0, len(data)) @@ -666,11 +661,11 @@ func sortMapByValues(data map[string]int) []string { for key := range data { keys = append(keys, key) } - sort.SliceStable(keys, func(i, j int) bool{ + sort.SliceStable(keys, func(i, j int) bool { return data[keys[i]] < data[keys[j]] }) - for _, k := range keys{ + for _, k := range keys { ret = append(ret, k) } return ret diff --git a/iSolarCloud/api/GoStruct/structmap.go b/iSolarCloud/api/GoStruct/structmap.go index 048899420..6c089d218 100644 --- a/iSolarCloud/api/GoStruct/structmap.go +++ b/iSolarCloud/api/GoStruct/structmap.go @@ -1,16 +1,16 @@ package GoStruct import ( - "GoSungrow/iSolarCloud/api/GoStruct/reflection" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "reflect" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type StructMapOptions struct { StartAt string @@ -34,11 +34,13 @@ type StructMap struct { VirtualMap map[string]*Reflect _Timestamp valueTypes.DateTime - Error error + Error error } -func (sm *StructMap) PrintDebug(format string, args ...interface{}) { - if sm.Debug { _, _ = fmt.Fprintf(os.Stderr, format, args...) } +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) { @@ -93,45 +95,45 @@ func (sm *StructMap) Scan(Parent *Reflect, Current *Reflect) *StructMap { } 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) + 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) } } @@ -151,7 +153,7 @@ func (sm *StructMap) ScanMap(Parent *Reflect, Current *Reflect) bool { break } - ok = true // ok = Current.IsKnown() + ok = true // ok = Current.IsKnown() for index, key := range Current.FieldVo.MapKeys() { var Child Reflect Child.SetByIndex(Parent, Current, index, key) @@ -190,7 +192,7 @@ func (sm *StructMap) ScanSlice(Parent *Reflect, Current *Reflect) bool { break } - ok = true // ok = Current.IsKnown() + ok = true // ok = Current.IsKnown() for index := 0; index < Current.Length; index++ { var Child Reflect Child.SetByIndex(Parent, Current, index, reflect.Value{}) @@ -220,7 +222,7 @@ func (sm *StructMap) ScanStruct(Parent *Reflect, Current *Reflect) bool { break } - ok = true // ok = Current.IsKnown() + ok = true // ok = Current.IsKnown() for index := 0; index < Current.Length; index++ { var Child Reflect Child.SetByIndex(Parent, Current, index, reflect.Value{}) @@ -266,7 +268,7 @@ func (sm *StructMap) Process(Child *Reflect) bool { sm.PrintDebug("DEBUG: sm.Start.EndPointPath().PopLast(): %s\n", sm.Start.EndPointPath()) } - sm.PrintDebug( "DEBUG: sm.StructMapOptions.Name1: %s\n", sm.StructMapOptions.Name) + 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 @@ -274,7 +276,7 @@ func (sm *StructMap) Process(Child *Reflect) bool { if sm.Start == nil { ok = Child.IsKnown() - break // Wait until we've started. + break // Wait until we've started. } if Child.IsGoStruct() { @@ -290,7 +292,6 @@ func (sm *StructMap) Process(Child *Reflect) bool { } } - // Start processing the Child here on... if sm.Exists(Child) { // Already processed. @@ -373,7 +374,7 @@ func (sm *StructMap) Exists(Current *Reflect) bool { return yes } -func (sm *StructMap) Add(Current *Reflect) { +func (sm *StructMap) Add(Current *Reflect) { for range Only.Once { if Current.IsGoStruct() { break @@ -399,7 +400,7 @@ func (sm *StructMap) Add(Current *Reflect) { } } -func (sm *StructMap) AddTable(Current *Reflect) { +func (sm *StructMap) AddTable(Current *Reflect) { for range Only.Once { if Current.IsGoStruct() { break @@ -423,7 +424,7 @@ func (sm *StructMap) AddTable(Current *Reflect) { } } -func (sm *StructMap) AddVirtual(Current *Reflect) { +func (sm *StructMap) AddVirtual(Current *Reflect) { for range Only.Once { if Current.IsGoStruct() { break @@ -454,11 +455,11 @@ func (sm *StructMap) AddVirtual(Current *Reflect) { func (sm *StructMap) IsNil(Current *Reflect) bool { var yes bool for range Only.Once { - yes = Current.PointIgnoreIfChildFromNil() // true - Current is nil. + yes = Current.PointIgnoreIfChildFromNil() // true - Current is nil. if sm.AddNil { sm.Add(Current) - _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is nil: %s\n", Current) + _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field type is nil: %s\n", Current) break } } @@ -483,7 +484,7 @@ func (sm *StructMap) IsEmpty(Current *Reflect) bool { yes = true if sm.AddEmpty { sm.Add(Current) - _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is nil: %s\n", Current) + _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field type is nil: %s\n", Current) break } } @@ -500,7 +501,7 @@ func (sm *StructMap) IsUnexported(Current *Reflect) bool { yes = true if sm.AddUnexported { sm.Add(Current) - _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is not exported: %s\n", Current) + _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field type is not exported: %s\n", Current) } } return yes @@ -512,7 +513,7 @@ func (sm *StructMap) IsUnsupported(Current *Reflect) { break } sm.Add(Current) - _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is unsupported: %s\n", Current) + _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field type is unsupported: %s\n", Current) } } @@ -522,7 +523,7 @@ func (sm *StructMap) IsInvalid(Current *Reflect) { break } sm.Add(Current) - _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is invalid: %s\n", Current) + _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field type is invalid: %s\n", Current) } } diff --git a/iSolarCloud/api/file.go b/iSolarCloud/api/file.go index 1e9fb0c20..aca2296d3 100644 --- a/iSolarCloud/api/file.go +++ b/iSolarCloud/api/file.go @@ -1,16 +1,16 @@ package api import ( - "github.com/MickMake/GoUnify/Only" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "errors" "fmt" - "github.com/MickMake/GoUnify/cmdPath" "os" "path/filepath" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" + "github.com/MickMake/GoUnify/cmdPath" +) // func (ep *EndPointStruct) ApiSetFilenamePrefix2(ref interface{}, format string, args ...interface{}) string { // f := strings.Join(GoStruct.GetStructValuesAsArray(ref), "-") @@ -87,7 +87,6 @@ func (ep *EndPointStruct) GetFilePath() string { return ret } - // FileExists Checks for existence of a local file. func (ep *EndPointStruct) FileExists(fn string) bool { var ok bool diff --git a/iSolarCloud/api/interface_area.go b/iSolarCloud/api/interface_area.go index 25ad6fd6d..f48dd42a3 100644 --- a/iSolarCloud/api/interface_area.go +++ b/iSolarCloud/api/interface_area.go @@ -1,6 +1,6 @@ package api -import "GoSungrow/iSolarCloud/api/GoStruct/output" +import "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" type Area interface { Init(*Web) AreaStruct @@ -14,4 +14,3 @@ type Area interface { IsValid(name EndPointName) error GetError(name EndPointName) error } - diff --git a/iSolarCloud/api/interface_endpoint.go b/iSolarCloud/api/interface_endpoint.go index 706a002ea..23e751c28 100644 --- a/iSolarCloud/api/interface_endpoint.go +++ b/iSolarCloud/api/interface_endpoint.go @@ -1,8 +1,9 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" "time" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) type EndPoint interface { diff --git a/iSolarCloud/api/struct_areas.go b/iSolarCloud/api/struct_areas.go index b903a1b1e..93a5cb0d3 100644 --- a/iSolarCloud/api/struct_areas.go +++ b/iSolarCloud/api/struct_areas.go @@ -1,20 +1,19 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "sort" "strings" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoUnify/Only" +) type Areas map[AreaName]AreaStruct // TypeEndPoints // Map of EndPoints by area name. type AreaName string type AreaNames []AreaName - func (an *Areas) Exists(area string) bool { var ok bool _, ok = (*an)[AreaName(area)] diff --git a/iSolarCloud/api/struct_data.go b/iSolarCloud/api/struct_data.go index 38dedd85a..a6727eff0 100644 --- a/iSolarCloud/api/struct_data.go +++ b/iSolarCloud/api/struct_data.go @@ -1,22 +1,22 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "sort" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type DataMap struct { - Map map[string]*DataEntries + Map map[string]*DataEntries parentDeviceId string TimeStamp time.Time @@ -28,7 +28,7 @@ type DataMap struct { } func NewDataMap() DataMap { - return DataMap { + return DataMap{ Map: make(map[string]*DataEntries), } } @@ -42,11 +42,11 @@ func (dm *DataMap) StructToDataMap(endpoint EndPoint, parentDeviceId string, nam dm.EndPoint = endpoint dm.parentDeviceId = parentDeviceId dm.EndPointPath = name - dm.TimeStamp = time.Now() // .Round(5 * time.Minute) + dm.TimeStamp = time.Now() // .Round(5 * time.Minute) dm.Debug = endpoint.IsDebug() // Parse response structure. - dm.StructMap.InitScan(endpoint.ResponseRef(), GoStruct.StructMapOptions { + dm.StructMap.InitScan(endpoint.ResponseRef(), GoStruct.StructMapOptions{ StartAt: "ResultData", Name: name, TimeStamp: dm.TimeStamp, @@ -133,7 +133,7 @@ func (dm *DataMap) CopyPoint(refEndpoint *GoStruct.Reflect, endpoint GoStruct.En if pointName != "" { Current.DataStructure.PointName = pointName // Current.DataStructure.PointName += " (" + Current.DataStructure.PointId + ")" - // } else { + // } else { } @@ -312,13 +312,13 @@ func (dm *DataMap) ProcessMap() { } switch { - case Child.DataStructure.Endpoint.IsBeginsWith("virtual"): - // Don't prepend path - fixes the double virtual path issue. - case Child.DataStructure.PointVirtualShift > 0: - Child.DataStructure.Endpoint.ShiftLeft(Child.DataStructure.PointVirtualShift) - Child.DataStructure.Endpoint.InsertFirst("virtual") - default: - Child.DataStructure.Endpoint.ReplaceFirst("virtual") + case Child.DataStructure.Endpoint.IsBeginsWith("virtual"): + // Don't prepend path - fixes the double virtual path issue. + case Child.DataStructure.PointVirtualShift > 0: + Child.DataStructure.Endpoint.ShiftLeft(Child.DataStructure.PointVirtualShift) + Child.DataStructure.Endpoint.InsertFirst("virtual") + default: + Child.DataStructure.Endpoint.ReplaceFirst("virtual") } dm.AddPointUnitValues(Child, dm.parentDeviceId, when) @@ -326,7 +326,6 @@ func (dm *DataMap) ProcessMap() { } } - type Tables GoStruct.StructTables func (dm *DataMap) CreateDataTables() Tables { @@ -372,7 +371,7 @@ func (dm *DataMap) CreateResultTable(full bool) output.Table { for _, de := range entries { if full { if de.Current.DataStructure.DataTable { - continue // We are a datatable parent. + continue // We are a datatable parent. } if de.Current.CurrentReflect.IsPointListFlatten() { @@ -385,10 +384,10 @@ func (dm *DataMap) CreateResultTable(full bool) output.Table { } } else { if de.Hide { - continue // Ignore hidden entries. + continue // Ignore hidden entries. } if de.Current.DataStructure.DataTableChild { - continue // Ignore data table children. + continue // Ignore data table children. } // child, i := de.Current.IsTableChild() // fmt.Printf("%t[%d]\n", child, i) @@ -549,7 +548,6 @@ func (dm *DataMap) Sort() []string { return sorted } - 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 @@ -560,15 +558,15 @@ func CreatePointDataEntry(Current *GoStruct.Reflect, parentDeviceId string, poin uv.SetDeviceId(parentDeviceId) } - ret = DataEntry { - Current: Current, - EndPoint: Current.EndPointPath().String(), - Point: &point, - Parent: NewParentDevice(parentDeviceId), - Date: dateTime, - Value: uv, - Valid: true, - Hide: false, + ret = DataEntry{ + Current: Current, + EndPoint: Current.EndPointPath().String(), + Point: &point, + Parent: NewParentDevice(parentDeviceId), + Date: dateTime, + Value: uv, + Valid: true, + Hide: false, // Index: 0, } } @@ -640,7 +638,7 @@ func CreatePoint(Current *GoStruct.Reflect, parentDeviceId string) Point { var parents ParentDevices parents.Add(parent) - point = Point { + point = Point{ Parents: parents, Id: Current.PointId(), GroupName: Current.PointGroupName(), @@ -662,7 +660,7 @@ func GetPercent(value float64, max float64, precision int) float64 { return 0 } - percent := valueTypes.SetPrecision((value / max) * 100, precision) + percent := valueTypes.SetPrecision((value/max)*100, precision) return percent } diff --git a/iSolarCloud/api/struct_de.go b/iSolarCloud/api/struct_de.go index 0f244abcb..906cd9b2c 100644 --- a/iSolarCloud/api/struct_de.go +++ b/iSolarCloud/api/struct_de.go @@ -1,22 +1,21 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/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"` - Date valueTypes.DateTime `json:"date"` - Value valueTypes.UnitValue `json:"value"` + Current *GoStruct.Reflect `json:"-"` + EndPoint string `json:"endpoint"` + Point *Point `json:"point"` + Parent ParentDevice `json:"parent"` + Date valueTypes.DateTime `json:"date"` + Value valueTypes.UnitValue `json:"value"` - Valid bool `json:"valid"` - Hide bool `json:"hide"` + Valid bool `json:"valid"` + Hide bool `json:"hide"` // ListHide bool `json:"list_hide"` } diff --git a/iSolarCloud/api/struct_endpoint.go b/iSolarCloud/api/struct_endpoint.go index be14852e8..c37e847b8 100644 --- a/iSolarCloud/api/struct_endpoint.go +++ b/iSolarCloud/api/struct_endpoint.go @@ -1,15 +1,15 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" "encoding/json" "errors" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" "github.com/MickMake/GoUnify/Only" ) - type EndPointName string func (n EndPointName) String() string { @@ -17,8 +17,8 @@ func (n EndPointName) String() string { } type EndPointStruct struct { - ApiRoot Web `json:"-"` - RawResponse []byte + ApiRoot Web `json:"-"` + RawResponse []byte Area AreaName `json:"area"` Name EndPointName `json:"name"` @@ -130,7 +130,6 @@ func (ep EndPointStruct) ApiGetRequestArgNames(req interface{}) map[string]strin return GoStruct.GetStructFields(req) } - func MarshalJSON(endpoint EndPoint) ([]byte, error) { e := endpoint.SetError("") j, err := json.Marshal(&struct { diff --git a/iSolarCloud/api/struct_point.go b/iSolarCloud/api/struct_point.go index 76fe3287c..db1c65a91 100644 --- a/iSolarCloud/api/struct_point.go +++ b/iSolarCloud/api/struct_point.go @@ -1,28 +1,27 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" - "github.com/MickMake/GoUnify/Only" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type Point struct { - Parents ParentDevices `json:"parents,omitempty"` - Id string `json:"id,omitempty"` - GroupName string `json:"group_name,omitempty"` - Description string `json:"description,omitempty"` - Unit string `json:"unit,omitempty"` - UpdateFreq string `json:"time_span,omitempty"` - ValueType string `json:"value_type,omitempty"` - Valid bool `json:"valid,omitempty"` - States map[string]string `json:"states,omitempty"` + Parents ParentDevices `json:"parents,omitempty"` + Id string `json:"id,omitempty"` + GroupName string `json:"group_name,omitempty"` + Description string `json:"description,omitempty"` + Unit string `json:"unit,omitempty"` + UpdateFreq string `json:"time_span,omitempty"` + ValueType string `json:"value_type,omitempty"` + Valid bool `json:"valid,omitempty"` + States map[string]string `json:"states,omitempty"` } - func (p *Point) FixUnitType() Point { vt := valueTypes.UnitValueType(p.Unit) if vt != "" { @@ -41,53 +40,52 @@ func (p *Point) WhenReset(date valueTypes.DateTime) string { now = date.Time switch { - case p.Is5Minute(): - // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 5).Format("2006-01-02T15:04:05")) - // ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Truncate(time.Minute * 5).Format(valueTypes.DateTimeFullLayout) - - case p.Is15Minute(): - // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 15).Format("2006-01-02T15:04:05")) - // ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Truncate(time.Minute * 15).Format(valueTypes.DateTimeFullLayout) - - case p.Is30Minute(): - // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 30).Format("2006-01-02T15:04:05")) - // ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Truncate(time.Minute * 30).Format(valueTypes.DateTimeFullLayout) - - - case p.IsInstant(): - // ret = "" - // valueTypes.DateTimeFullLayout - ret = now.Format(valueTypes.DateTimeFullLayout) - - case p.IsBoot(): - now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01-02") + "T00:00:00") - // ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Format(valueTypes.DateTimeFullLayout) - - case p.IsDaily(): - now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01-02") + "T00:00:00") - // ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Format(valueTypes.DateTimeFullLayout) - - case p.IsMonthly(): - now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01") + "-01T00:00:00") - ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Format(valueTypes.DateTimeFullLayout) - - case p.IsYearly(): - now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006") + "-01-01T00:00:00") - ret = fmt.Sprintf("%d", now.Unix()) - ret = now.Format(valueTypes.DateTimeFullLayout) - - case p.IsTotal(): - ret = "1970-01-01T00:00:00" - - default: - // ret = "1970-01-01T00:00:00" - ret = now.Format(valueTypes.DateTimeFullLayout) + case p.Is5Minute(): + // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 5).Format("2006-01-02T15:04:05")) + // ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Truncate(time.Minute * 5).Format(valueTypes.DateTimeFullLayout) + + case p.Is15Minute(): + // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 15).Format("2006-01-02T15:04:05")) + // ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Truncate(time.Minute * 15).Format(valueTypes.DateTimeFullLayout) + + case p.Is30Minute(): + // now, err = time.Parse("2006-01-02T15:04:05", now.Truncate(time.Minute * 30).Format("2006-01-02T15:04:05")) + // ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Truncate(time.Minute * 30).Format(valueTypes.DateTimeFullLayout) + + case p.IsInstant(): + // ret = "" + // valueTypes.DateTimeFullLayout + ret = now.Format(valueTypes.DateTimeFullLayout) + + case p.IsBoot(): + now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01-02")+"T00:00:00") + // ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Format(valueTypes.DateTimeFullLayout) + + case p.IsDaily(): + now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01-02")+"T00:00:00") + // ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Format(valueTypes.DateTimeFullLayout) + + case p.IsMonthly(): + now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006-01")+"-01T00:00:00") + ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Format(valueTypes.DateTimeFullLayout) + + case p.IsYearly(): + now, err = time.Parse("2006-01-02T15:04:05", now.Format("2006")+"-01-01T00:00:00") + ret = fmt.Sprintf("%d", now.Unix()) + ret = now.Format(valueTypes.DateTimeFullLayout) + + case p.IsTotal(): + ret = "1970-01-01T00:00:00" + + default: + // ret = "1970-01-01T00:00:00" + ret = now.Format(valueTypes.DateTimeFullLayout) } if err != nil { // now := time.Now() @@ -172,7 +170,6 @@ func (p *Point) SetName(name string) { p.Description = name } - func GetPoint(point string) *Point { return Points.Get(point) } @@ -219,7 +216,6 @@ func GetDevicePoint(devicePoint string) *Point { // return point // } - type ParentDevice struct { Key string `json:"ps_key"` PsId string `json:"ps_id"` @@ -266,9 +262,8 @@ func (pd *ParentDevice) Split() { } } - type ParentDevices struct { - Map map[string]*ParentDevice + Map map[string]*ParentDevice Index []string } diff --git a/iSolarCloud/api/struct_template_points.go b/iSolarCloud/api/struct_template_points.go index 095f27b27..fcea78683 100644 --- a/iSolarCloud/api/struct_template_points.go +++ b/iSolarCloud/api/struct_template_points.go @@ -1,12 +1,12 @@ package api import ( - "github.com/MickMake/GoUnify/Only" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" "strings" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) type TemplatePoint struct { Name string @@ -16,7 +16,6 @@ type TemplatePoint struct { } type TemplatePoints []TemplatePoint - func (t *TemplatePoints) PrintKeys() string { var ret string for _, p := range *t { diff --git a/iSolarCloud/api/types.go b/iSolarCloud/api/types.go index eb3f9388b..e986038dd 100644 --- a/iSolarCloud/api/types.go +++ b/iSolarCloud/api/types.go @@ -1,10 +1,9 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" ) - func (w *Web) ApiGetEndPointResultTable(endpoint EndPoint) output.Table { var table output.Table // for range Only.Once { @@ -63,4 +62,4 @@ func (w *Web) ApiGetEndPointDataTables(endpoint EndPoint) output.Tables { // // }) // } return table -} \ No newline at end of file +} diff --git a/iSolarCloud/api/utils.go b/iSolarCloud/api/utils.go index e22be338b..2ff488bb8 100644 --- a/iSolarCloud/api/utils.go +++ b/iSolarCloud/api/utils.go @@ -1,14 +1,14 @@ package api import ( - "github.com/MickMake/GoUnify/Only" - "GoSungrow/iSolarCloud/api/GoStruct/reflection" "fmt" "net/url" "reflect" "strings" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/reflection" + "github.com/MickMake/GoUnify/Only" +) type Api struct{} diff --git a/iSolarCloud/api/web.go b/iSolarCloud/api/web.go index e43515870..f7e39be72 100644 --- a/iSolarCloud/api/web.go +++ b/iSolarCloud/api/web.go @@ -1,14 +1,15 @@ package api import ( - "GoSungrow/iSolarCloud/api/GoStruct" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "github.com/MickMake/GoUnify/Only" - "github.com/MickMake/GoUnify/cmdPath" "io" "path/filepath" "time" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoUnify/Only" + "github.com/MickMake/GoUnify/cmdPath" + "bytes" "encoding/json" "errors" @@ -16,7 +17,6 @@ import ( "net/http" ) - type Web struct { ServerUrl EndPointUrl Body []byte @@ -30,7 +30,6 @@ type Web struct { httpResponse *http.Response } - func (w *Web) SetUrl(u string) error { w.ServerUrl = SetUrl(u) return w.Error @@ -54,7 +53,6 @@ func (w *Web) Get(endpoint EndPoint) EndPoint { isCached = true } - if isCached { w.Body, w.Error = w.WebCacheRead(endpoint) if w.Error != nil { @@ -68,7 +66,6 @@ func (w *Web) Get(endpoint EndPoint) EndPoint { } } - if len(w.Body) == 0 { w.Error = errors.New("empty http response") break @@ -265,7 +262,6 @@ func (w *Web) WebCacheWrite(endpoint EndPoint, data []byte) error { return output.PlainFileWrite(fn, data, output.DefaultFileMode) } - // PointCacheCheck Retrieves cache data from a local file. func (w *Web) PointCacheCheck(data DataMap) bool { var ok bool diff --git a/iSolarCloud/data.go b/iSolarCloud/data.go index 49f5123fe..16f780599 100644 --- a/iSolarCloud/data.go +++ b/iSolarCloud/data.go @@ -1,19 +1,19 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "sort" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) // ****************************************************** // @@ -28,12 +28,11 @@ func (sg *SunGrow) NewSunGrowData() SunGrowData { return data } - func SplitArg(arg string) []string { var ret []string for range Only.Once { ret = []string{arg} - for _, s := range []string{ ",", "/", " "} { + for _, s := range []string{",", "/", " "} { if strings.Contains(arg, s) { ret = strings.Split(arg, s) break @@ -43,14 +42,12 @@ func SplitArg(arg string) []string { return ret } - type EndPoints map[string]EndPoint type EndPoint struct { - Func SunGrowDataFunction + Func SunGrowDataFunction HasArgs bool } - type SunGrowData struct { Args []string endPoints []string @@ -58,17 +55,19 @@ type SunGrowData struct { Results SunGrowDataResults - sunGrow *SunGrow - outputType output.OutputType - saveAsFile bool + sunGrow *SunGrow + outputType output.OutputType + saveAsFile bool cacheTimeout time.Duration - Debug bool - Error error + Debug bool + Error error } -func (sgd *SunGrowData) PrintDebug(format string, args ...interface{}) { - if sgd.Debug { _, _ = fmt.Fprintf(os.Stderr, format, args...) } +func (sgd *SunGrowData) PrintDebug(format string, args ...interface{}) { + if sgd.Debug { + _, _ = fmt.Fprintf(os.Stderr, format, args...) + } } func (sgd *SunGrowData) New(ref *SunGrow) { @@ -162,32 +161,32 @@ func (sgd *SunGrowData) CallEndpoint(endpoint api.EndPoint, request SunGrowDataR args := request.GetArgs(response.Data.EndPoint) name := endpoint.GetArea().String() + "." + endpoint.GetName().String() var title string - var file string // + " - " + request.RequestAsFilePrefix(), + var file string // + " - " + request.RequestAsFilePrefix(), key := request.GetPrimaryArg() if key != "" { title = key file = key } - response.Options = OutputOptions { + response.Options = OutputOptions{ Name: name, OutputType: sgd.sunGrow.OutputType, PrimaryKey: key, FileSuffix: file, SaveAsFile: sgd.sunGrow.SaveAsFile, TitleSuffix: args, - GraphRequest: output.GraphRequest { + GraphRequest: output.GraphRequest{ Title: title, SubTitle: args, TimeColumn: nil, DataColumn: nil, UnitsColumn: nil, NameColumn: nil, - DataMin: nil, - DataMax: nil, - Width: nil, - Height: nil, - Error: nil, + DataMin: nil, + DataMax: nil, + Width: nil, + Height: nil, + Error: nil, }, } sgd.PrintDebug("OutputOptions: %v\n", response.Options) @@ -282,7 +281,7 @@ func (sgd *SunGrowData) getDataSinglePsIdRequired(ep api.EndPoint) error { if sgd.Error != nil { break } - sgd.Results[result.EndPointName.String() + "/" + psId.String()] = result + sgd.Results[result.EndPointName.String()+"/"+psId.String()] = result } if sgd.Error != nil { break @@ -351,7 +350,6 @@ func (sgd *SunGrowData) OutputDataTables() error { return sgd.Error } - type SunGrowDataResults map[string]SunGrowDataResult type SunGrowDataResult struct { EndPointArea api.AreaName @@ -360,7 +358,7 @@ type SunGrowDataResult struct { Request SunGrowDataRequest Response SunGrowDataResponse - Error error + Error error } func (sgd *SunGrowDataResult) Process() error { @@ -395,7 +393,6 @@ func (sgd *SunGrowDataResult) Print() { fmt.Println(sgd.Response.Data.String()) } - type OutputOptions struct { Name string TitleSuffix string @@ -421,9 +418,9 @@ type OutputOptions struct { type SunGrowDataResponses map[string]SunGrowDataResponse type SunGrowDataFunction func(request SunGrowDataRequest) SunGrowDataResponse type SunGrowDataResponse struct { - Data api.DataMap - Options OutputOptions - Error error + Data api.DataMap + Options OutputOptions + Error error } // func (sgd *SunGrowDataResponse) CreateResultTable(full bool) output.Table { @@ -488,7 +485,7 @@ func (sgd *SunGrowDataResponse) OutputDataTables() error { sgd.Options.TitleSuffix = data.Table.GetTitle() } data.Table.OutputType = sgd.Options.OutputType - data.Table.SetSaveFile(sgd.Options.SaveAsFile) // sgd.Options.SaveAsFile + data.Table.SetSaveFile(sgd.Options.SaveAsFile) // sgd.Options.SaveAsFile if sgd.Options.OutputType.IsGraph() { if !data.IsValid { diff --git a/iSolarCloud/data_request.go b/iSolarCloud/data_request.go index b24a5dbe6..f69734313 100644 --- a/iSolarCloud/data_request.go +++ b/iSolarCloud/data_request.go @@ -1,15 +1,15 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "fmt" - "github.com/MickMake/GoUnify/Only" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) // SunGrowDataRequest - Collection of all possible request args. type SunGrowDataRequest struct { @@ -22,67 +22,67 @@ type SunGrowDataRequests map[string]SunGrowDataRequest type RequestArgs struct { // Be careful with types. If you see a general 'error' response, // then it's more likely a type mismatch. - PsId *valueTypes.PsId `json:"ps_id,omitempty"` - PsId2 *valueTypes.PsId `json:"psId,omitempty"` // Specifically for WebIscmAppService.getPowerStationInfo & AppService/querySysAdvancedParam & WebIscmAppService/getContactMessage & WebAppService/getDevicePointAttrs - PsId3 *valueTypes.PsId `json:"psid,omitempty"` // Specifically for WebAppService.getPsTree - PsIds *valueTypes.PsIds `json:"psIds,omitempty"` - PsIdList *valueTypes.String `json:"ps_id_list,omitempty"` - ReportType *valueTypes.Integer `json:"report_type,omitempty"` - FaultTypeCode *valueTypes.Integer `json:"fault_type_code,omitempty"` - Size *valueTypes.Integer `json:"size,omitempty"` - CurPage *valueTypes.Integer `json:"curPage,omitempty"` - DeviceType *valueTypes.Integer `json:"device_type,omitempty"` - DeviceType2 *valueTypes.Integer `json:"deviceType,omitempty"` // Specifically for WebAppService.getDevicePointAttrs - ReportId *valueTypes.String `json:"report_id,omitempty"` - CodeType *valueTypes.String `json:"code_type,omitempty"` - OrgIds *valueTypes.String `json:"orgIds,omitempty"` - TemplateId *valueTypes.String `json:"template_id,omitempty"` - DeviceModelId *valueTypes.String `json:"device_model_id,omitempty"` - Uuid *valueTypes.Integer `json:"uuid,omitempty"` - UuidList *valueTypes.String `json:"uuid_list,omitempty"` - SetType *valueTypes.String `json:"set_type,omitempty"` - Type *valueTypes.String `json:"type,omitempty"` - DataType *valueTypes.String `json:"data_type,omitempty"` + PsId *valueTypes.PsId `json:"ps_id,omitempty"` + PsId2 *valueTypes.PsId `json:"psId,omitempty"` // Specifically for WebIscmAppService.getPowerStationInfo & AppService/querySysAdvancedParam & WebIscmAppService/getContactMessage & WebAppService/getDevicePointAttrs + PsId3 *valueTypes.PsId `json:"psid,omitempty"` // Specifically for WebAppService.getPsTree + PsIds *valueTypes.PsIds `json:"psIds,omitempty"` + PsIdList *valueTypes.String `json:"ps_id_list,omitempty"` + ReportType *valueTypes.Integer `json:"report_type,omitempty"` + FaultTypeCode *valueTypes.Integer `json:"fault_type_code,omitempty"` + Size *valueTypes.Integer `json:"size,omitempty"` + CurPage *valueTypes.Integer `json:"curPage,omitempty"` + DeviceType *valueTypes.Integer `json:"device_type,omitempty"` + DeviceType2 *valueTypes.Integer `json:"deviceType,omitempty"` // Specifically for WebAppService.getDevicePointAttrs + ReportId *valueTypes.String `json:"report_id,omitempty"` + CodeType *valueTypes.String `json:"code_type,omitempty"` + OrgIds *valueTypes.String `json:"orgIds,omitempty"` + TemplateId *valueTypes.String `json:"template_id,omitempty"` + DeviceModelId *valueTypes.String `json:"device_model_id,omitempty"` + Uuid *valueTypes.Integer `json:"uuid,omitempty"` + UuidList *valueTypes.String `json:"uuid_list,omitempty"` + SetType *valueTypes.String `json:"set_type,omitempty"` + Type *valueTypes.String `json:"type,omitempty"` + DataType *valueTypes.String `json:"data_type,omitempty"` // Points - PsKeyList *valueTypes.String `json:"ps_key_list,omitempty"` - PsKeys *valueTypes.PsKeys `json:"-,omitempty"` // Used by queryMutiPointDataList - PsKey *valueTypes.PsKey `json:"ps_key,omitempty"` - Point *valueTypes.PointId `json:"point_id,omitempty"` - Points *valueTypes.PointIds `json:"points,omitempty"` - DataPoint *valueTypes.String `json:"data_point,omitempty"` + PsKeyList *valueTypes.String `json:"ps_key_list,omitempty"` + PsKeys *valueTypes.PsKeys `json:"-,omitempty"` // Used by queryMutiPointDataList + PsKey *valueTypes.PsKey `json:"ps_key,omitempty"` + Point *valueTypes.PointId `json:"point_id,omitempty"` + Points *valueTypes.PointIds `json:"points,omitempty"` + DataPoint *valueTypes.String `json:"data_point,omitempty"` // DateTime - DateId *valueTypes.DateTime `json:"date_id,omitempty"` - DateType *string `json:"date_type,omitempty"` - MonthDate *valueTypes.DateTime `json:"month_date,omitempty"` - MonthDate2 *valueTypes.DateTime `json:"monthDate,omitempty"` - Day *valueTypes.DateTime `json:"day,omitempty"` - BeginTime1 *valueTypes.DateTime `json:"beginTime,omitempty"` // valueTypes.Time - EndTime1 *valueTypes.DateTime `json:"endTime,omitempty"` // valueTypes.Time - StartTimeStamp *valueTypes.DateTime `json:"start_time_stamp,omitempty"` - EndTimeStamp *valueTypes.DateTime `json:"end_time_stamp,omitempty"` - StartTime *valueTypes.DateTime `json:"start_time,omitempty"` // valueTypes.Time - EndTime *valueTypes.DateTime `json:"end_time,omitempty"` // valueTypes.Time + DateId *valueTypes.DateTime `json:"date_id,omitempty"` + DateType *string `json:"date_type,omitempty"` + MonthDate *valueTypes.DateTime `json:"month_date,omitempty"` + MonthDate2 *valueTypes.DateTime `json:"monthDate,omitempty"` + Day *valueTypes.DateTime `json:"day,omitempty"` + BeginTime1 *valueTypes.DateTime `json:"beginTime,omitempty"` // valueTypes.Time + EndTime1 *valueTypes.DateTime `json:"endTime,omitempty"` // valueTypes.Time + StartTimeStamp *valueTypes.DateTime `json:"start_time_stamp,omitempty"` + EndTimeStamp *valueTypes.DateTime `json:"end_time_stamp,omitempty"` + StartTime *valueTypes.DateTime `json:"start_time,omitempty"` // valueTypes.Time + EndTime *valueTypes.DateTime `json:"end_time,omitempty"` // valueTypes.Time // UNVERIFIED - AppKey *valueTypes.String `json:"app_key,omitempty"` - DealerOrgCode *valueTypes.String `json:"dealer_org_code,omitempty"` - DeviceSn *valueTypes.String `json:"device_sn,omitempty"` - FaultCode *valueTypes.Integer `json:"fault_code,omitempty"` - FaultName *valueTypes.String `json:"fault_name,omitempty"` - Id *valueTypes.Integer `json:"id,omitempty"` - MinuteInterval *valueTypes.Integer `json:"minute_interval,omitempty"` - OrderId *valueTypes.String `json:"order_id,omitempty"` - OrgId *valueTypes.String `json:"org_id,omitempty"` - Prefix *valueTypes.String `json:"prefix,omitempty"` - PrimaryKey *valueTypes.String `json:"primaryKey,omitempty"` - QueryType *valueTypes.String `json:"query_type,omitempty"` - Sn *valueTypes.String `json:"sn,omitempty"` - Table *valueTypes.String `json:"table,omitempty"` - TaskId *valueTypes.String `json:"task_id,omitempty"` - UserId *valueTypes.String `json:"userId,omitempty"` - MenuId *valueTypes.Integer `json:"menuId,omitempty"` + AppKey *valueTypes.String `json:"app_key,omitempty"` + DealerOrgCode *valueTypes.String `json:"dealer_org_code,omitempty"` + DeviceSn *valueTypes.String `json:"device_sn,omitempty"` + FaultCode *valueTypes.Integer `json:"fault_code,omitempty"` + FaultName *valueTypes.String `json:"fault_name,omitempty"` + Id *valueTypes.Integer `json:"id,omitempty"` + MinuteInterval *valueTypes.Integer `json:"minute_interval,omitempty"` + OrderId *valueTypes.String `json:"order_id,omitempty"` + OrgId *valueTypes.String `json:"org_id,omitempty"` + Prefix *valueTypes.String `json:"prefix,omitempty"` + PrimaryKey *valueTypes.String `json:"primaryKey,omitempty"` + QueryType *valueTypes.String `json:"query_type,omitempty"` + Sn *valueTypes.String `json:"sn,omitempty"` + Table *valueTypes.String `json:"table,omitempty"` + TaskId *valueTypes.String `json:"task_id,omitempty"` + UserId *valueTypes.String `json:"userId,omitempty"` + MenuId *valueTypes.Integer `json:"menuId,omitempty"` // UserId2 *valueTypes.String `json:"userId,omitempty"` // PsId valueTypes.PsId `json:"id"` @@ -116,34 +116,34 @@ type RequestArgs struct { //goland:noinspection GoCommentStart const ( - NamePsId = "PsId" - NamePsId2 = "PsId2" - NamePsId3 = "PsId3" - NamePsIds = "PsIds" - NamePsIdList = "PsIdList" - NameReportType = "ReportType" - NameFaultTypeCode = "FaultTypeCode" - NameSize = "Size" - NameCurPage = "CurPage" - NameDeviceType = "DeviceType" - NameDeviceType2 = "DeviceType2" - NameReportId = "ReportId" - NameCodeType = "CodeType" - NameOrgIds = "OrgIds" - NameTemplateId = "TemplateId" - NameDeviceModelId = "DeviceModelId" - NameUuid = "Uuid" - NameUuidList = "UuidList" - NameSetType = "SetType" - NameType = "Type" - NameDataType = "DataType" - - NamePsKeyList = "PsKeyList" - NamePsKeys = "PsKeys" - NamePsKey = "PsKey" - NamePointId = "PointId" - NamePoints = "Points" - NameDataPoint = "DataPoint" + NamePsId = "PsId" + NamePsId2 = "PsId2" + NamePsId3 = "PsId3" + NamePsIds = "PsIds" + NamePsIdList = "PsIdList" + NameReportType = "ReportType" + NameFaultTypeCode = "FaultTypeCode" + NameSize = "Size" + NameCurPage = "CurPage" + NameDeviceType = "DeviceType" + NameDeviceType2 = "DeviceType2" + NameReportId = "ReportId" + NameCodeType = "CodeType" + NameOrgIds = "OrgIds" + NameTemplateId = "TemplateId" + NameDeviceModelId = "DeviceModelId" + NameUuid = "Uuid" + NameUuidList = "UuidList" + NameSetType = "SetType" + NameType = "Type" + NameDataType = "DataType" + + NamePsKeyList = "PsKeyList" + NamePsKeys = "PsKeys" + NamePsKey = "PsKey" + NamePointId = "PointId" + NamePoints = "Points" + NameDataPoint = "DataPoint" // DateTime NameDateId = "DateId" @@ -178,33 +178,33 @@ const ( ) var Help = map[string]string{ - NamePsId: "valid ps_id", - NamePsId2: "valid ps_id", - NamePsId3: "valid ps_id", - NamePsIds: "list of ps_id", - NamePsIdList: "", - NameReportType: api.HelpReportType(), - NameFaultTypeCode: "", - NameSize: "Page size", - NameCurPage: "Current page", - NameDeviceType: "", - NameDeviceType2: "", - NameReportId: "", - NameCodeType: "", - NameOrgIds: "", - NameTemplateId: "", - NameDeviceModelId: "", - NameUuid: "UUID", - NameUuidList: "Comma separated list of UUIDs", - NameSetType: "", - NameType: api.HelpReportType(), - NameDataType: "", - - NamePsKeyList: "", - NamePsKey: "", - NamePointId: "", - NamePoints: "", - NameDataPoint: "", + NamePsId: "valid ps_id", + NamePsId2: "valid ps_id", + NamePsId3: "valid ps_id", + NamePsIds: "list of ps_id", + NamePsIdList: "", + NameReportType: api.HelpReportType(), + NameFaultTypeCode: "", + NameSize: "Page size", + NameCurPage: "Current page", + NameDeviceType: "", + NameDeviceType2: "", + NameReportId: "", + NameCodeType: "", + NameOrgIds: "", + NameTemplateId: "", + NameDeviceModelId: "", + NameUuid: "UUID", + NameUuidList: "Comma separated list of UUIDs", + NameSetType: "", + NameType: api.HelpReportType(), + NameDataType: "", + + NamePsKeyList: "", + NamePsKey: "", + NamePointId: "", + NamePoints: "", + NameDataPoint: "", // DateTime NameDateId: "Date in format YYYYMMDD or YYYYMM or YYYY", @@ -259,36 +259,36 @@ func (sgd SunGrowDataRequest) MarshalJSON() ([]byte, error) { type Parse RequestArgs // Store result from string - data, err = json.Marshal(Parse { - PsId: sgd.args.PsId, - PsId2: sgd.args.PsId2, - PsId3: sgd.args.PsId3, - PsIds: sgd.args.PsIds, - PsIdList: sgd.args.PsIdList, - ReportType: sgd.args.ReportType, - FaultTypeCode: sgd.args.FaultTypeCode, - Size: sgd.args.Size, - CurPage: sgd.args.CurPage, - DeviceType: sgd.args.DeviceType, - DeviceType2: sgd.args.DeviceType2, - ReportId: sgd.args.ReportId, - CodeType: sgd.args.CodeType, - OrgIds: sgd.args.OrgIds, - TemplateId: sgd.args.TemplateId, - DeviceModelId: sgd.args.DeviceModelId, - Uuid: sgd.args.Uuid, - UuidList: sgd.args.UuidList, - SetType: sgd.args.SetType, - Type: sgd.args.Type, - DataType: sgd.args.DataType, + data, err = json.Marshal(Parse{ + PsId: sgd.args.PsId, + PsId2: sgd.args.PsId2, + PsId3: sgd.args.PsId3, + PsIds: sgd.args.PsIds, + PsIdList: sgd.args.PsIdList, + ReportType: sgd.args.ReportType, + FaultTypeCode: sgd.args.FaultTypeCode, + Size: sgd.args.Size, + CurPage: sgd.args.CurPage, + DeviceType: sgd.args.DeviceType, + DeviceType2: sgd.args.DeviceType2, + ReportId: sgd.args.ReportId, + CodeType: sgd.args.CodeType, + OrgIds: sgd.args.OrgIds, + TemplateId: sgd.args.TemplateId, + DeviceModelId: sgd.args.DeviceModelId, + Uuid: sgd.args.Uuid, + UuidList: sgd.args.UuidList, + SetType: sgd.args.SetType, + Type: sgd.args.Type, + DataType: sgd.args.DataType, // Points - PsKeyList: sgd.args.PsKeyList, - PsKey: sgd.args.PsKey, - PsKeys: sgd.args.PsKeys, - Point: sgd.args.Point, - Points: sgd.args.Points, - DataPoint: sgd.args.DataPoint, + PsKeyList: sgd.args.PsKeyList, + PsKey: sgd.args.PsKey, + PsKeys: sgd.args.PsKeys, + Point: sgd.args.Point, + Points: sgd.args.Points, + DataPoint: sgd.args.DataPoint, // DateTime DateId: sgd.args.DateId, @@ -298,8 +298,8 @@ func (sgd SunGrowDataRequest) MarshalJSON() ([]byte, error) { EndTime1: sgd.args.EndTime1, StartTimeStamp: sgd.args.StartTimeStamp, EndTimeStamp: sgd.args.EndTimeStamp, - StartTime: sgd.args.StartTime, - EndTime: sgd.args.EndTime, + StartTime: sgd.args.StartTime, + EndTime: sgd.args.EndTime, // UNVERIFIED Day: sgd.args.Day, @@ -332,124 +332,168 @@ func (sgd SunGrowDataRequest) MarshalJSON() ([]byte, error) { func (sgd *SunGrowDataRequest) Set(arg string, value string) { for range Only.Once { switch arg { - case NamePsId: - fallthrough - case NamePsId2: - fallthrough - case NamePsId3: - sgd.aPsId = valueTypes.SetPsIdStrings(SplitArg(value)) // strings.Split(a[1], ",")) - sgd.SetPsId(value) - case NamePsIds: - sgd.aPsId = valueTypes.SetPsIdStrings(SplitArg(value)) // strings.Split(a[1], ",")) - val := valueTypes.SetPsIdStrings(SplitArg(value)); sgd.args.PsIds = &val - case NameReportType: - val := valueTypes.SetIntegerString(value); sgd.args.ReportType = &val - case NameFaultTypeCode: - val := valueTypes.SetIntegerString(value); sgd.args.FaultTypeCode = &val - case NameSize: - val := valueTypes.SetIntegerString(value); sgd.args.Size = &val - case NameCurPage: - val := valueTypes.SetIntegerString(value); sgd.args.CurPage = &val - case NameDeviceType: - val := valueTypes.SetIntegerString(value); sgd.args.DeviceType = &val - case NameDeviceType2: - val := valueTypes.SetIntegerString(value); sgd.args.DeviceType2 = &val - case NameReportId: - val := valueTypes.SetStringValue(value); sgd.args.ReportId = &val - case NameCodeType: - val := valueTypes.SetStringValue(value); sgd.args.CodeType = &val - case NameOrgIds: - val := valueTypes.SetStringValue(value); sgd.args.OrgIds = &val - case NamePsIdList: - val := valueTypes.SetStringValue(value); sgd.args.PsIdList = &val - case NameTemplateId: - val := valueTypes.SetStringValue(value); sgd.args.TemplateId = &val - case NameDeviceModelId: - val := valueTypes.SetStringValue(value); sgd.args.DeviceModelId = &val - case NameUuid: - val := valueTypes.SetIntegerString(value); sgd.args.Uuid = &val - case NameUuidList: - val := valueTypes.SetStringValue(value); sgd.args.UuidList = &val - case NameSetType: - val := valueTypes.SetStringValue(value); sgd.args.SetType = &val - case NameType: - val := valueTypes.SetStringValue(value); sgd.args.Type = &val - case NameDataType: - val := valueTypes.SetStringValue(value); sgd.args.DataType = &val - - // Points - case NamePsKeyList: - val := valueTypes.SetStringValue(value); sgd.args.PsKeyList = &val - case NamePsKeys: - val := valueTypes.SetPsKeysString(value); sgd.args.PsKeys = &val - case NamePsKey: - val := valueTypes.SetPsKeyString(value); sgd.args.PsKey = &val - case NamePointId: - val := valueTypes.SetPointIdString(value); sgd.args.Point = &val - case NamePoints: - sgd.SetPoints(value) - // val := valueTypes.SetPointIdsString(value); sgd.args.Points = &val - case NameDataPoint: - // sgd.SetPoints(value) - val := valueTypes.SetStringValue(value); sgd.args.DataPoint = &val - - // DateTime - case NameDateId: - sgd.SetDateId(value) - case NameMonthDate: - sgd.SetMonthDate(value) - case NameDay: - sgd.SetDay(value) - case NameBeginTime1: - val := valueTypes.SetDateTimeString(value); sgd.args.BeginTime1 = &val - case NameEndTime1: - val := valueTypes.SetDateTimeString(value); sgd.args.EndTime1 = &val - case NameStartTimeStamp: - val := valueTypes.SetDateTimeString(value); sgd.args.StartTimeStamp = &val - case NameEndTimeStamp: - val := valueTypes.SetDateTimeString(value); sgd.args.EndTimeStamp = &val - case NameStartTime: - sgd.SetStartTime(value) - // val := valueTypes.SetDateTimeString(value); sgd.args.StartTime = &val - case NameEndTime: - sgd.SetEndTime(value) - // val := valueTypes.SetDateTimeString(value); sgd.args.EndTime = &val - - // UNVERIFIED - case NameAppKey: - val := valueTypes.SetStringValue(value); sgd.args.AppKey = &val - case NameDealerOrgCode: - val := valueTypes.SetStringValue(value); sgd.args.DealerOrgCode = &val - case NameDeviceSn: - val := valueTypes.SetStringValue(value); sgd.args.DeviceSn = &val - case NameFaultCode: - val := valueTypes.SetIntegerString(value); sgd.args.FaultCode = &val - case NameFaultName: - val := valueTypes.SetStringValue(value); sgd.args.FaultName = &val - case NameId: - val := valueTypes.SetIntegerString(value); sgd.args.Id = &val - case NameMinuteInterval: - val := valueTypes.SetIntegerString(value); sgd.args.MinuteInterval = &val - case NameOrderId: - val := valueTypes.SetStringValue(value); sgd.args.OrderId = &val - case NameOrgId: - val := valueTypes.SetStringValue(value); sgd.args.OrgId = &val - case NamePrefix: - val := valueTypes.SetStringValue(value); sgd.args.Prefix = &val - case NamePrimaryKey: - val := valueTypes.SetStringValue(value); sgd.args.PrimaryKey = &val - case NameQueryType: - val := valueTypes.SetStringValue(value); sgd.args.QueryType = &val - case NameSn: - val := valueTypes.SetStringValue(value); sgd.args.Sn = &val - case NameTable: - val := valueTypes.SetStringValue(value); sgd.args.Table = &val - case NameTaskId: - val := valueTypes.SetStringValue(value); sgd.args.TaskId = &val - case NameUserId: - val := valueTypes.SetStringValue(value); sgd.args.UserId = &val - case NameMenuId: - val := valueTypes.SetIntegerString(value); sgd.args.MenuId = &val + case NamePsId: + fallthrough + case NamePsId2: + fallthrough + case NamePsId3: + sgd.aPsId = valueTypes.SetPsIdStrings(SplitArg(value)) // strings.Split(a[1], ",")) + sgd.SetPsId(value) + case NamePsIds: + sgd.aPsId = valueTypes.SetPsIdStrings(SplitArg(value)) // strings.Split(a[1], ",")) + val := valueTypes.SetPsIdStrings(SplitArg(value)) + sgd.args.PsIds = &val + case NameReportType: + val := valueTypes.SetIntegerString(value) + sgd.args.ReportType = &val + case NameFaultTypeCode: + val := valueTypes.SetIntegerString(value) + sgd.args.FaultTypeCode = &val + case NameSize: + val := valueTypes.SetIntegerString(value) + sgd.args.Size = &val + case NameCurPage: + val := valueTypes.SetIntegerString(value) + sgd.args.CurPage = &val + case NameDeviceType: + val := valueTypes.SetIntegerString(value) + sgd.args.DeviceType = &val + case NameDeviceType2: + val := valueTypes.SetIntegerString(value) + sgd.args.DeviceType2 = &val + case NameReportId: + val := valueTypes.SetStringValue(value) + sgd.args.ReportId = &val + case NameCodeType: + val := valueTypes.SetStringValue(value) + sgd.args.CodeType = &val + case NameOrgIds: + val := valueTypes.SetStringValue(value) + sgd.args.OrgIds = &val + case NamePsIdList: + val := valueTypes.SetStringValue(value) + sgd.args.PsIdList = &val + case NameTemplateId: + val := valueTypes.SetStringValue(value) + sgd.args.TemplateId = &val + case NameDeviceModelId: + val := valueTypes.SetStringValue(value) + sgd.args.DeviceModelId = &val + case NameUuid: + val := valueTypes.SetIntegerString(value) + sgd.args.Uuid = &val + case NameUuidList: + val := valueTypes.SetStringValue(value) + sgd.args.UuidList = &val + case NameSetType: + val := valueTypes.SetStringValue(value) + sgd.args.SetType = &val + case NameType: + val := valueTypes.SetStringValue(value) + sgd.args.Type = &val + case NameDataType: + val := valueTypes.SetStringValue(value) + sgd.args.DataType = &val + + // Points + case NamePsKeyList: + val := valueTypes.SetStringValue(value) + sgd.args.PsKeyList = &val + case NamePsKeys: + val := valueTypes.SetPsKeysString(value) + sgd.args.PsKeys = &val + case NamePsKey: + val := valueTypes.SetPsKeyString(value) + sgd.args.PsKey = &val + case NamePointId: + val := valueTypes.SetPointIdString(value) + sgd.args.Point = &val + case NamePoints: + sgd.SetPoints(value) + // val := valueTypes.SetPointIdsString(value); sgd.args.Points = &val + case NameDataPoint: + // sgd.SetPoints(value) + val := valueTypes.SetStringValue(value) + sgd.args.DataPoint = &val + + // DateTime + case NameDateId: + sgd.SetDateId(value) + case NameMonthDate: + sgd.SetMonthDate(value) + case NameDay: + sgd.SetDay(value) + case NameBeginTime1: + val := valueTypes.SetDateTimeString(value) + sgd.args.BeginTime1 = &val + case NameEndTime1: + val := valueTypes.SetDateTimeString(value) + sgd.args.EndTime1 = &val + case NameStartTimeStamp: + val := valueTypes.SetDateTimeString(value) + sgd.args.StartTimeStamp = &val + case NameEndTimeStamp: + val := valueTypes.SetDateTimeString(value) + sgd.args.EndTimeStamp = &val + case NameStartTime: + sgd.SetStartTime(value) + // val := valueTypes.SetDateTimeString(value); sgd.args.StartTime = &val + case NameEndTime: + sgd.SetEndTime(value) + // val := valueTypes.SetDateTimeString(value); sgd.args.EndTime = &val + + // UNVERIFIED + case NameAppKey: + val := valueTypes.SetStringValue(value) + sgd.args.AppKey = &val + case NameDealerOrgCode: + val := valueTypes.SetStringValue(value) + sgd.args.DealerOrgCode = &val + case NameDeviceSn: + val := valueTypes.SetStringValue(value) + sgd.args.DeviceSn = &val + case NameFaultCode: + val := valueTypes.SetIntegerString(value) + sgd.args.FaultCode = &val + case NameFaultName: + val := valueTypes.SetStringValue(value) + sgd.args.FaultName = &val + case NameId: + val := valueTypes.SetIntegerString(value) + sgd.args.Id = &val + case NameMinuteInterval: + val := valueTypes.SetIntegerString(value) + sgd.args.MinuteInterval = &val + case NameOrderId: + val := valueTypes.SetStringValue(value) + sgd.args.OrderId = &val + case NameOrgId: + val := valueTypes.SetStringValue(value) + sgd.args.OrgId = &val + case NamePrefix: + val := valueTypes.SetStringValue(value) + sgd.args.Prefix = &val + case NamePrimaryKey: + val := valueTypes.SetStringValue(value) + sgd.args.PrimaryKey = &val + case NameQueryType: + val := valueTypes.SetStringValue(value) + sgd.args.QueryType = &val + case NameSn: + val := valueTypes.SetStringValue(value) + sgd.args.Sn = &val + case NameTable: + val := valueTypes.SetStringValue(value) + sgd.args.Table = &val + case NameTaskId: + val := valueTypes.SetStringValue(value) + sgd.args.TaskId = &val + case NameUserId: + val := valueTypes.SetStringValue(value) + sgd.args.UserId = &val + case NameMenuId: + val := valueTypes.SetIntegerString(value) + sgd.args.MenuId = &val } } } @@ -458,119 +502,118 @@ func (sgd *SunGrowDataRequest) Get(arg string) string { var value string for range Only.Once { switch arg { - case NamePsId: - value = sgd.args.PsId.String() - case NamePsId2: - value = sgd.args.PsId2.String() - case NamePsId3: - value = sgd.args.PsId3.String() - case NamePsIds: - value = strings.Join(sgd.args.PsIds.Strings(), ",") - case NameReportType: - value = sgd.args.ReportType.String() - case NameFaultTypeCode: - value = sgd.args.FaultTypeCode.String() - case NameSize: - value = sgd.args.Size.String() - case NameCurPage: - value = sgd.args.CurPage.String() - case NameDeviceType: - value = sgd.args.DeviceType.String() - case NameDeviceType2: - value = sgd.args.DeviceType2.String() - case NameReportId: - value = sgd.args.ReportId.String() - case NameCodeType: - value = sgd.args.CodeType.String() - case NameOrgIds: - value = sgd.args.OrgIds.String() - case NamePsIdList: - value = sgd.args.PsIdList.String() - case NameTemplateId: - value = sgd.args.TemplateId.String() - case NameDeviceModelId: - value = sgd.args.DeviceModelId.String() - case NameUuid: - value = sgd.args.Uuid.String() - case NameUuidList: - value = sgd.args.UuidList.String() - case NameSetType: - value = sgd.args.SetType.String() - case NameType: - value = sgd.args.Type.String() - case NameDataType: - value = sgd.args.DataType.String() - - // Points - case NamePsKeyList: - value = sgd.args.PsKeyList.String() - case NamePsKeys: - value = sgd.args.PsKeys.String() - case NamePsKey: - value = sgd.args.PsKey.String() - case NamePointId: - value = sgd.args.Point.String() - case NamePoints: - value = sgd.args.Points.String() - case NameDataPoint: - value = sgd.args.DataPoint.String() - - - // DateTime - case NameMonthDate: - value = sgd.args.MonthDate.Original() - case NameDateId: - value = sgd.args.DateId.Original() - case NameDay: - value = sgd.args.Day.Original() - case NameBeginTime1: - value = sgd.args.BeginTime1.Original() - case NameEndTime1: - value = sgd.args.EndTime1.Original() - case NameStartTimeStamp: - value = sgd.args.StartTimeStamp.Format(valueTypes.DateTimeLayoutSecond) // .Original() - case NameEndTimeStamp: - value = sgd.args.EndTimeStamp.Format(valueTypes.DateTimeLayoutSecond) // .Original() - case NameStartTime: - value = sgd.args.StartTime.Original() - case NameEndTime: - value = sgd.args.EndTime.Original() - - // UNVERIFIED - case NameAppKey: - value = sgd.args.AppKey.String() - case NameDealerOrgCode: - value = sgd.args.DealerOrgCode.String() - case NameDeviceSn: - value = sgd.args.DeviceSn.String() - case NameFaultCode: - value = sgd.args.FaultCode.String() - case NameFaultName: - value = sgd.args.FaultName.String() - case NameId: - value = sgd.args.Id.String() - case NameMinuteInterval: - value = sgd.args.MinuteInterval.String() - case NameOrderId: - value = sgd.args.OrderId.String() - case NameOrgId: - value = sgd.args.OrgId.String() - case NamePrefix: - value = sgd.args.Prefix.String() - case NamePrimaryKey: - value = sgd.args.PrimaryKey.String() - case NameQueryType: - value = sgd.args.QueryType.String() - case NameSn: - value = sgd.args.Sn.String() - case NameTable: - value = sgd.args.Table.String() - case NameTaskId: - value = sgd.args.TaskId.String() - case NameUserId: - value = sgd.args.UserId.String() - case NameMenuId: - value = sgd.args.MenuId.String() + case NamePsId: + value = sgd.args.PsId.String() + case NamePsId2: + value = sgd.args.PsId2.String() + case NamePsId3: + value = sgd.args.PsId3.String() + case NamePsIds: + value = strings.Join(sgd.args.PsIds.Strings(), ",") + case NameReportType: + value = sgd.args.ReportType.String() + case NameFaultTypeCode: + value = sgd.args.FaultTypeCode.String() + case NameSize: + value = sgd.args.Size.String() + case NameCurPage: + value = sgd.args.CurPage.String() + case NameDeviceType: + value = sgd.args.DeviceType.String() + case NameDeviceType2: + value = sgd.args.DeviceType2.String() + case NameReportId: + value = sgd.args.ReportId.String() + case NameCodeType: + value = sgd.args.CodeType.String() + case NameOrgIds: + value = sgd.args.OrgIds.String() + case NamePsIdList: + value = sgd.args.PsIdList.String() + case NameTemplateId: + value = sgd.args.TemplateId.String() + case NameDeviceModelId: + value = sgd.args.DeviceModelId.String() + case NameUuid: + value = sgd.args.Uuid.String() + case NameUuidList: + value = sgd.args.UuidList.String() + case NameSetType: + value = sgd.args.SetType.String() + case NameType: + value = sgd.args.Type.String() + case NameDataType: + value = sgd.args.DataType.String() + + // Points + case NamePsKeyList: + value = sgd.args.PsKeyList.String() + case NamePsKeys: + value = sgd.args.PsKeys.String() + case NamePsKey: + value = sgd.args.PsKey.String() + case NamePointId: + value = sgd.args.Point.String() + case NamePoints: + value = sgd.args.Points.String() + case NameDataPoint: + value = sgd.args.DataPoint.String() + + // DateTime + case NameMonthDate: + value = sgd.args.MonthDate.Original() + case NameDateId: + value = sgd.args.DateId.Original() + case NameDay: + value = sgd.args.Day.Original() + case NameBeginTime1: + value = sgd.args.BeginTime1.Original() + case NameEndTime1: + value = sgd.args.EndTime1.Original() + case NameStartTimeStamp: + value = sgd.args.StartTimeStamp.Format(valueTypes.DateTimeLayoutSecond) // .Original() + case NameEndTimeStamp: + value = sgd.args.EndTimeStamp.Format(valueTypes.DateTimeLayoutSecond) // .Original() + case NameStartTime: + value = sgd.args.StartTime.Original() + case NameEndTime: + value = sgd.args.EndTime.Original() + + // UNVERIFIED + case NameAppKey: + value = sgd.args.AppKey.String() + case NameDealerOrgCode: + value = sgd.args.DealerOrgCode.String() + case NameDeviceSn: + value = sgd.args.DeviceSn.String() + case NameFaultCode: + value = sgd.args.FaultCode.String() + case NameFaultName: + value = sgd.args.FaultName.String() + case NameId: + value = sgd.args.Id.String() + case NameMinuteInterval: + value = sgd.args.MinuteInterval.String() + case NameOrderId: + value = sgd.args.OrderId.String() + case NameOrgId: + value = sgd.args.OrgId.String() + case NamePrefix: + value = sgd.args.Prefix.String() + case NamePrimaryKey: + value = sgd.args.PrimaryKey.String() + case NameQueryType: + value = sgd.args.QueryType.String() + case NameSn: + value = sgd.args.Sn.String() + case NameTable: + value = sgd.args.Table.String() + case NameTaskId: + value = sgd.args.TaskId.String() + case NameUserId: + value = sgd.args.UserId.String() + case NameMenuId: + value = sgd.args.MenuId.String() } } return value @@ -580,133 +623,228 @@ func (sgd *SunGrowDataRequest) IsSet(arg string) bool { var ok bool for range Only.Once { switch arg { - case NamePsId: - // Handled differently. + case NamePsId: + // Handled differently. + ok = true + // if sgd.args.PsId != nil { ok = true } + case NamePsId2: + // Handled differently. + ok = true + // if sgd.args.PsId2 != nil { ok = true } + case NamePsId3: + // Handled differently. + ok = true + // if sgd.args.PsId3 != nil { ok = true } + case NamePsIds: + // Handled differently. + ok = true + // if sgd.args.PsIds != nil { ok = true } + case NameReportType: + if sgd.args.ReportType != nil { ok = true - // if sgd.args.PsId != nil { ok = true } - case NamePsId2: - // Handled differently. + } + case NameFaultTypeCode: + if sgd.args.FaultTypeCode != nil { ok = true - // if sgd.args.PsId2 != nil { ok = true } - case NamePsId3: - // Handled differently. + } + case NameSize: + if sgd.args.Size != nil { ok = true - // if sgd.args.PsId3 != nil { ok = true } - case NamePsIds: - // Handled differently. + } + case NameCurPage: + if sgd.args.CurPage != nil { ok = true - // if sgd.args.PsIds != nil { ok = true } - case NameReportType: - if sgd.args.ReportType != nil { ok = true } - case NameFaultTypeCode: - if sgd.args.FaultTypeCode != nil { ok = true } - case NameSize: - if sgd.args.Size != nil { ok = true } - case NameCurPage: - if sgd.args.CurPage != nil { ok = true } - case NameDeviceType: - if sgd.args.DeviceType != nil { ok = true } - case NameDeviceType2: - if sgd.args.DeviceType2 != nil { ok = true } - case NameReportId: - if sgd.args.ReportId != nil { ok = true } - case NameCodeType: - if sgd.args.CodeType != nil { ok = true } - case NameOrgIds: - if sgd.args.OrgIds != nil { ok = true } - case NamePsIdList: - if sgd.args.PsIdList != nil { ok = true } - case NameTemplateId: - if sgd.args.TemplateId != nil { ok = true } - case NameDeviceModelId: - if sgd.args.DeviceModelId != nil { ok = true } - case NameUuid: - if sgd.args.Uuid != nil { ok = true } - case NameUuidList: - if sgd.args.UuidList != nil { ok = true } - case NameSetType: - if sgd.args.SetType != nil { ok = true } - case NameType: - if sgd.args.Type != nil { ok = true } - case NameDataType: - if sgd.args.DataType != nil { ok = true } - + } + case NameDeviceType: + if sgd.args.DeviceType != nil { + ok = true + } + case NameDeviceType2: + if sgd.args.DeviceType2 != nil { + ok = true + } + case NameReportId: + if sgd.args.ReportId != nil { + ok = true + } + case NameCodeType: + if sgd.args.CodeType != nil { + ok = true + } + case NameOrgIds: + if sgd.args.OrgIds != nil { + ok = true + } + case NamePsIdList: + if sgd.args.PsIdList != nil { + ok = true + } + case NameTemplateId: + if sgd.args.TemplateId != nil { + ok = true + } + case NameDeviceModelId: + if sgd.args.DeviceModelId != nil { + ok = true + } + case NameUuid: + if sgd.args.Uuid != nil { + ok = true + } + case NameUuidList: + if sgd.args.UuidList != nil { + ok = true + } + case NameSetType: + if sgd.args.SetType != nil { + ok = true + } + case NameType: + if sgd.args.Type != nil { + ok = true + } + case NameDataType: + if sgd.args.DataType != nil { + ok = true + } - // Points - case NamePsKeyList: - if sgd.args.PsKeyList != nil { ok = true } - case NamePsKeys: - if sgd.args.PsKeys != nil { ok = true } - case NamePsKey: - if sgd.args.PsKey != nil { ok = true } - case NamePointId: - if sgd.args.Point != nil { ok = true } - case NamePoints: - if sgd.args.Points != nil { ok = true } - case NameDataPoint: - if sgd.args.DataPoint != nil { ok = true } + // Points + case NamePsKeyList: + if sgd.args.PsKeyList != nil { + ok = true + } + case NamePsKeys: + if sgd.args.PsKeys != nil { + ok = true + } + case NamePsKey: + if sgd.args.PsKey != nil { + ok = true + } + case NamePointId: + if sgd.args.Point != nil { + ok = true + } + case NamePoints: + if sgd.args.Points != nil { + ok = true + } + case NameDataPoint: + if sgd.args.DataPoint != nil { + ok = true + } - // DateTime - case NameMonthDate: - if sgd.args.MonthDate != nil { ok = true } - case NameDateId: - if sgd.args.DateId != nil { ok = true } - case NameDay: - if sgd.args.Day != nil { ok = true } - case NameBeginTime1: - if sgd.args.BeginTime1 != nil { ok = true } - case NameEndTime1: - if sgd.args.EndTime1 != nil { ok = true } - case NameStartTimeStamp: - if sgd.args.StartTimeStamp != nil { ok = true } - case NameEndTimeStamp: - if sgd.args.EndTimeStamp != nil { ok = true } - case NameStartTime: - if sgd.args.StartTime != nil { ok = true } - case NameEndTime: - if sgd.args.EndTime != nil { ok = true } + // DateTime + case NameMonthDate: + if sgd.args.MonthDate != nil { + ok = true + } + case NameDateId: + if sgd.args.DateId != nil { + ok = true + } + case NameDay: + if sgd.args.Day != nil { + ok = true + } + case NameBeginTime1: + if sgd.args.BeginTime1 != nil { + ok = true + } + case NameEndTime1: + if sgd.args.EndTime1 != nil { + ok = true + } + case NameStartTimeStamp: + if sgd.args.StartTimeStamp != nil { + ok = true + } + case NameEndTimeStamp: + if sgd.args.EndTimeStamp != nil { + ok = true + } + case NameStartTime: + if sgd.args.StartTime != nil { + ok = true + } + case NameEndTime: + if sgd.args.EndTime != nil { + ok = true + } - // UNVERIFIED - case NameAppKey: - if sgd.args.AppKey != nil { ok = true } - case NameDealerOrgCode: - if sgd.args.DealerOrgCode != nil { ok = true } - case NameDeviceSn: - if sgd.args.DeviceSn != nil { ok = true } - case NameFaultCode: - if sgd.args.FaultCode != nil { ok = true } - case NameFaultName: - if sgd.args.FaultName != nil { ok = true } - case NameId: - if sgd.args.Id != nil { ok = true } - case NameMinuteInterval: - if sgd.args.MinuteInterval != nil { ok = true } - case NameOrderId: - if sgd.args.OrderId != nil { ok = true } - case NameOrgId: - if sgd.args.OrgId != nil { ok = true } - case NamePrefix: - if sgd.args.Prefix != nil { ok = true } - case NamePrimaryKey: - if sgd.args.PrimaryKey != nil { ok = true } - case NameQueryType: - // Handled differently. + // UNVERIFIED + case NameAppKey: + if sgd.args.AppKey != nil { ok = true - // if sgd.args.QueryType != nil { ok = true } - case NameSn: - if sgd.args.Sn != nil { ok = true } - case NameTable: - if sgd.args.Table != nil { ok = true } - case NameTaskId: - if sgd.args.TaskId != nil { ok = true } - case NameUserId: - if sgd.args.UserId != nil { ok = true } - case NameMenuId: - if sgd.args.MenuId != nil { ok = true } - case NameDateType: - // Handled differently. + } + case NameDealerOrgCode: + if sgd.args.DealerOrgCode != nil { + ok = true + } + case NameDeviceSn: + if sgd.args.DeviceSn != nil { ok = true - // if sgd.args.DateType != nil { ok = true } + } + case NameFaultCode: + if sgd.args.FaultCode != nil { + ok = true + } + case NameFaultName: + if sgd.args.FaultName != nil { + ok = true + } + case NameId: + if sgd.args.Id != nil { + ok = true + } + case NameMinuteInterval: + if sgd.args.MinuteInterval != nil { + ok = true + } + case NameOrderId: + if sgd.args.OrderId != nil { + ok = true + } + case NameOrgId: + if sgd.args.OrgId != nil { + ok = true + } + case NamePrefix: + if sgd.args.Prefix != nil { + ok = true + } + case NamePrimaryKey: + if sgd.args.PrimaryKey != nil { + ok = true + } + case NameQueryType: + // Handled differently. + ok = true + // if sgd.args.QueryType != nil { ok = true } + case NameSn: + if sgd.args.Sn != nil { + ok = true + } + case NameTable: + if sgd.args.Table != nil { + ok = true + } + case NameTaskId: + if sgd.args.TaskId != nil { + ok = true + } + case NameUserId: + if sgd.args.UserId != nil { + ok = true + } + case NameMenuId: + if sgd.args.MenuId != nil { + ok = true + } + case NameDateType: + // Handled differently. + ok = true + // if sgd.args.DateType != nil { ok = true } } } return ok @@ -763,7 +901,7 @@ func (sgd *SunGrowDataRequest) GetArgs(endpoint api.EndPoint) string { } if key == NameDateType { - continue // Handled differently. + continue // Handled differently. } if sgd.IsNotSet(key) { @@ -895,12 +1033,12 @@ func (sgd *SunGrowDataRequest) SetStartTime(date string) { } var qt valueTypes.String switch len(date) { - case 8: - qt = qt.SetString("1") - case 6: - qt = qt.SetString("2") - case 4: - qt = qt.SetString("3") + case 8: + qt = qt.SetString("1") + case 6: + qt = qt.SetString("2") + case 4: + qt = qt.SetString("3") } sgd.args.QueryType = &qt } @@ -917,12 +1055,12 @@ func (sgd *SunGrowDataRequest) SetEndTime(date string) { } var qt valueTypes.String switch len(date) { - case 8: - qt = qt.SetString("1") - case 6: - qt = qt.SetString("2") - case 4: - qt = qt.SetString("3") + case 8: + qt = qt.SetString("1") + case 6: + qt = qt.SetString("2") + case 4: + qt = qt.SetString("3") } sgd.args.QueryType = &qt } @@ -1005,32 +1143,32 @@ func (sgd *SunGrowDataRequest) GetPrimaryArg() string { var yes string for range Only.Once { switch { - case sgd.IsRequiredAndSet(NamePsKey): - yes = sgd.Get(NamePsKey) - case sgd.IsRequiredAndSet(NamePsId): - yes = sgd.Get(NamePsId) - case sgd.IsRequiredAndSet(NamePsId2): - yes = sgd.Get(NamePsId2) - case sgd.IsRequiredAndSet(NamePsId3): - yes = sgd.Get(NamePsId3) - case sgd.IsRequiredAndSet(NameUuid): - yes = sgd.Get(NameUuid) - case sgd.IsRequiredAndSet(NameFaultCode): - yes = sgd.Get(NameFaultCode) - case sgd.IsRequiredAndSet(NameDeviceType): - yes = sgd.Get(NameDeviceType) - case sgd.IsRequiredAndSet(NameOrgId): - yes = sgd.Get(NameOrgId) - case sgd.IsRequiredAndSet(NameTaskId): - yes = sgd.Get(NameTaskId) - case sgd.IsRequiredAndSet(NameSn): - yes = sgd.Get(NameSn) - case sgd.IsRequiredAndSet(NameCodeType): - yes = sgd.Get(NameCodeType) - case sgd.IsRequiredAndSet(NameReportType): - yes = sgd.Get(NameReportType) - case sgd.IsRequiredAndSet(NameUserId): - yes = sgd.Get(NameUserId) + case sgd.IsRequiredAndSet(NamePsKey): + yes = sgd.Get(NamePsKey) + case sgd.IsRequiredAndSet(NamePsId): + yes = sgd.Get(NamePsId) + case sgd.IsRequiredAndSet(NamePsId2): + yes = sgd.Get(NamePsId2) + case sgd.IsRequiredAndSet(NamePsId3): + yes = sgd.Get(NamePsId3) + case sgd.IsRequiredAndSet(NameUuid): + yes = sgd.Get(NameUuid) + case sgd.IsRequiredAndSet(NameFaultCode): + yes = sgd.Get(NameFaultCode) + case sgd.IsRequiredAndSet(NameDeviceType): + yes = sgd.Get(NameDeviceType) + case sgd.IsRequiredAndSet(NameOrgId): + yes = sgd.Get(NameOrgId) + case sgd.IsRequiredAndSet(NameTaskId): + yes = sgd.Get(NameTaskId) + case sgd.IsRequiredAndSet(NameSn): + yes = sgd.Get(NameSn) + case sgd.IsRequiredAndSet(NameCodeType): + yes = sgd.Get(NameCodeType) + case sgd.IsRequiredAndSet(NameReportType): + yes = sgd.Get(NameReportType) + case sgd.IsRequiredAndSet(NameUserId): + yes = sgd.Get(NameUserId) } } return yes @@ -1068,10 +1206,10 @@ func (sgd *SunGrowDataRequest) SetPsId(psId string) { sgd.args.PsId = &pid } if sgd.IsRequired(NamePsId2) { - sgd.args.PsId2 = &pid // Specifically for WebIscmAppService.getPowerStationInfo + sgd.args.PsId2 = &pid // Specifically for WebIscmAppService.getPowerStationInfo } if sgd.IsRequired(NamePsId3) { - sgd.args.PsId3 = &pid // Specifically for WebAppService.getPsTree + sgd.args.PsId3 = &pid // Specifically for WebAppService.getPsTree } if sgd.IsRequired(NamePsIds) { // sgd.args.PsIds = &pid diff --git a/iSolarCloud/highlevel.go b/iSolarCloud/highlevel.go index 000f730fd..d8960753d 100644 --- a/iSolarCloud/highlevel.go +++ b/iSolarCloud/highlevel.go @@ -1,24 +1,24 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/getPowerStatistics" - "GoSungrow/iSolarCloud/AppService/getPsDetail" - "GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" - "GoSungrow/iSolarCloud/AppService/getPsHealthState" - "GoSungrow/iSolarCloud/AppService/getPsList" - "GoSungrow/iSolarCloud/AppService/getPsListStaticData" - "GoSungrow/iSolarCloud/AppService/getPsWeatherList" - "GoSungrow/iSolarCloud/AppService/powerDevicePointList" - "GoSungrow/iSolarCloud/AppService/queryDeviceList" - "GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" - "GoSungrow/iSolarCloud/WebAppService/showPSView" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" + + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStatistics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsHealthState" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsListStaticData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsWeatherList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/powerDevicePointList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showPSView" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) - func (sg *SunGrow) AllCritical() error { var ep api.EndPoint for range Only.Once { diff --git a/iSolarCloud/highlevel_device.go b/iSolarCloud/highlevel_device.go index 7ca1dd8f6..8e77e1359 100644 --- a/iSolarCloud/highlevel_device.go +++ b/iSolarCloud/highlevel_device.go @@ -1,21 +1,21 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/getDeviceList" - "GoSungrow/iSolarCloud/AppService/getDeviceModelInfoList" - "GoSungrow/iSolarCloud/AppService/getPowerDevicePointNames" - "GoSungrow/iSolarCloud/AppService/queryDeviceList" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" - datatable "go.pennock.tech/tabular/auto" "os" "sort" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceModelInfoList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDevicePointNames" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" + datatable "go.pennock.tech/tabular/auto" +) // DeviceTypeList - Return all device_types. func (sg *SunGrow) DeviceTypeList(psIds ...string) (string, error) { @@ -49,7 +49,7 @@ func (sg *SunGrow) DeviceTypeList(psIds ...string) (string, error) { table.AddHeaders("Device Type", "Name") ep := sg.GetByStruct(queryDeviceList.EndPointName, - queryDeviceList.RequestData{ PsId: pids[0] }, + queryDeviceList.RequestData{PsId: pids[0]}, DefaultCacheTimeout, ) if sg.IsError() { @@ -94,7 +94,7 @@ func (sg *SunGrow) DeviceTypePoints(deviceTypes ...string) (string, error) { } ep1 := sg.GetByStruct(queryDeviceList.EndPointName, - queryDeviceList.RequestData{ PsId: pids[0] }, + queryDeviceList.RequestData{PsId: pids[0]}, DefaultCacheTimeout, ) if sg.IsError() { @@ -102,13 +102,12 @@ func (sg *SunGrow) DeviceTypePoints(deviceTypes ...string) (string, error) { } data1 := queryDeviceList.Assert(ep1) - table := output.NewTable("Point Id", "Name", "Cal Type", "Device Type", "Device Name") // var points []getPowerDevicePointNames.Point for deviceType, deviceName := range data1.Response.ResultData.DevTypeDefinition { ep := sg.GetByStruct(getPowerDevicePointNames.EndPointName, - getPowerDevicePointNames.RequestData{ DeviceType: valueTypes.SetIntegerString(deviceType) }, + getPowerDevicePointNames.RequestData{DeviceType: valueTypes.SetIntegerString(deviceType)}, DefaultCacheTimeout, ) if sg.IsError() { @@ -189,7 +188,6 @@ func (sg *SunGrow) DeviceTypeData(deviceType string, startDate string, endDate s return sg.Error } - // GetDeviceList - AppService.getDeviceList func (sg *SunGrow) GetDeviceList(psIds ...string) ([]getDeviceList.Device, error) { var ret []getDeviceList.Device @@ -202,10 +200,10 @@ func (sg *SunGrow) GetDeviceList(psIds ...string) ([]getDeviceList.Device, error for _, psId := range pids { ep := sg.GetByStruct(getDeviceList.EndPointName, - getDeviceList.RequestData { + getDeviceList.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -230,7 +228,7 @@ func (sg *SunGrow) QueryDeviceList(psIds ...string) ([]queryDeviceList.Device, e for _, psId := range pids { ep := sg.GetByStruct(queryDeviceList.EndPointName, - queryDeviceList.RequestData { + queryDeviceList.RequestData{ PsId: psId, }, time.Hour*24, @@ -247,7 +245,6 @@ func (sg *SunGrow) QueryDeviceList(psIds ...string) ([]queryDeviceList.Device, e return ret, sg.Error } - func (sg *SunGrow) GetPowerDevicePointNames(device valueTypes.Integer) ([]getPowerDevicePointNames.Point, error) { var ret []getPowerDevicePointNames.Point for range Only.Once { @@ -266,7 +263,6 @@ func (sg *SunGrow) GetPowerDevicePointNames(device valueTypes.Integer) ([]getPow return ret, sg.Error } - func (sg *SunGrow) DeviceModelInfoList() error { for range Only.Once { ep := sg.GetByStruct(getDeviceModelInfoList.EndPointName, @@ -298,7 +294,6 @@ func (sg *SunGrow) DeviceModelInfoList() error { return sg.Error } - // func (sg *SunGrow) GetDevices(psId valueTypes.PsId) (getDeviceList.Devices, error) { // var ret getDeviceList.Devices // diff --git a/iSolarCloud/highlevel_meta.go b/iSolarCloud/highlevel_meta.go index 3c0328afb..568fb7ccd 100644 --- a/iSolarCloud/highlevel_meta.go +++ b/iSolarCloud/highlevel_meta.go @@ -1,14 +1,13 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys" - "GoSungrow/iSolarCloud/AppService/queryUnitList" - "GoSungrow/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryUnitList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" ) - func (sg *SunGrow) MetaUnitList() error { for range Only.Once { data := sg.NewSunGrowData() diff --git a/iSolarCloud/highlevel_point.go b/iSolarCloud/highlevel_point.go index d214e3d78..30c52e14c 100644 --- a/iSolarCloud/highlevel_point.go +++ b/iSolarCloud/highlevel_point.go @@ -1,38 +1,38 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" - "GoSungrow/iSolarCloud/AppService/getKpiInfo" - "GoSungrow/iSolarCloud/AppService/getPowerDevicePointInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStationData" - "GoSungrow/iSolarCloud/AppService/getPsDetail" - "GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" - "GoSungrow/iSolarCloud/AppService/getPsList" - "GoSungrow/iSolarCloud/AppService/queryDeviceList" - "GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" - "GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" - "github.com/MickMake/GoUnify/Only" "math" "os" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getKpiInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerDevicePointInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryMutiPointDataList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) // GetPowerDevicePointInfo - AppService.getPowerDevicePointInfo func (sg *SunGrow) GetPowerDevicePointInfo(min valueTypes.Integer, max valueTypes.Integer) ([]getPowerDevicePointInfo.ResultData, error) { var ret []getPowerDevicePointInfo.ResultData for range Only.Once { - _, _ = fmt.Fprintf(os.Stderr,"Scanning from %s to %s.", min, max) + _, _ = fmt.Fprintf(os.Stderr, "Scanning from %s to %s.", min, max) for id := min.Value(); id < max.Value(); id++ { PrintPause(id, 20) ep := sg.GetByStruct(getPowerDevicePointInfo.EndPointName, - getPowerDevicePointInfo.RequestData { + getPowerDevicePointInfo.RequestData{ Id: valueTypes.SetIntegerValue(id), }, time.Hour*24, @@ -44,7 +44,7 @@ func (sg *SunGrow) GetPowerDevicePointInfo(min valueTypes.Integer, max valueType data := getPowerDevicePointInfo.Assert(ep) ret = append(ret, data.Response.ResultData) } - _, _ = fmt.Fprintf(os.Stderr,"\n") + _, _ = fmt.Fprintf(os.Stderr, "\n") } return ret, sg.Error @@ -102,7 +102,7 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { // getPowerStationData // api raw getPowerStationData '{"date_id":"20221007","date_type":"1","ps_id":"1171348"}' ep = sg.GetByStruct(getPowerStationData.EndPointName, - getPowerStationData.RequestData{ PsId: psId, DateType: valueTypes.SetStringValue("1"), DateId: valueTypes.SetDateTimeString("20221007")}, + getPowerStationData.RequestData{PsId: psId, DateType: valueTypes.SetStringValue("1"), DateId: valueTypes.SetDateTimeString("20221007")}, DefaultCacheTimeout) if sg.IsError() { break @@ -117,7 +117,7 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { // api raw getPowerStationData '{"date_id":"202210","date_type":"2","ps_id":"1171348"}' ep = sg.GetByStruct(getPowerStationData.EndPointName, - getPowerStationData.RequestData{ PsId: psId, DateType: valueTypes.SetStringValue("2"), DateId: valueTypes.SetDateTimeString("202210")}, + getPowerStationData.RequestData{PsId: psId, DateType: valueTypes.SetStringValue("2"), DateId: valueTypes.SetDateTimeString("202210")}, DefaultCacheTimeout) if sg.IsError() { break @@ -132,7 +132,7 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { // api raw getPowerStationData '{"date_id":"2022","date_type":"3","ps_id":"1171348"}' ep = sg.GetByStruct(getPowerStationData.EndPointName, - getPowerStationData.RequestData{ PsId: psId, DateType: valueTypes.SetStringValue("3"), DateId: valueTypes.SetDateTimeString("2022")}, + getPowerStationData.RequestData{PsId: psId, DateType: valueTypes.SetStringValue("3"), DateId: valueTypes.SetDateTimeString("2022")}, DefaultCacheTimeout) if sg.IsError() { break @@ -145,10 +145,9 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // queryDeviceList // api get AppService.queryDeviceList '{"ps_id":"1171348"}' - ep = sg.GetByStruct(queryDeviceList.EndPointName, queryDeviceList.RequestData{ PsId: psId }, DefaultCacheTimeout) + ep = sg.GetByStruct(queryDeviceList.EndPointName, queryDeviceList.RequestData{PsId: psId}, DefaultCacheTimeout) if sg.IsError() { break } @@ -160,11 +159,10 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // getHouseholdStoragePsReport // api get getHouseholdStoragePsReport '{"date_id":"20221001","date_type":"1","ps_id":"1129147"}' ep = sg.GetByStruct(getHouseholdStoragePsReport.EndPointName, - getHouseholdStoragePsReport.RequestData{ DateId: valueTypes.SetDateTimeString("20221001"), DateType: valueTypes.SetStringValue("1"), PsId: psId }, + getHouseholdStoragePsReport.RequestData{DateId: valueTypes.SetDateTimeString("20221001"), DateType: valueTypes.SetStringValue("1"), PsId: psId}, DefaultCacheTimeout, ) if sg.IsError() { @@ -178,9 +176,8 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // getPsDetailWithPsType - ep = sg.GetByStruct(getPsDetailWithPsType.EndPointName, getPsDetailWithPsType.RequestData{ PsId: psId }, DefaultCacheTimeout) + ep = sg.GetByStruct(getPsDetailWithPsType.EndPointName, getPsDetailWithPsType.RequestData{PsId: psId}, DefaultCacheTimeout) if sg.IsError() { break } @@ -192,9 +189,8 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // getPsDetail - ep = sg.GetByStruct(getPsDetail.EndPointName, getPsDetail.RequestData{ PsId: psId }, DefaultCacheTimeout) + ep = sg.GetByStruct(getPsDetail.EndPointName, getPsDetail.RequestData{PsId: psId}, DefaultCacheTimeout) if sg.IsError() { break } @@ -206,9 +202,8 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // getKpiInfo - ep = sg.GetByStruct(getKpiInfo.EndPointName, getKpiInfo.RequestData{ }, DefaultCacheTimeout) + ep = sg.GetByStruct(getKpiInfo.EndPointName, getKpiInfo.RequestData{}, DefaultCacheTimeout) if sg.IsError() { break } @@ -220,7 +215,6 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { } points.AppendMap(data) - // // getPowerDevicePointInfo // ep = sg.GetByStruct(getPowerDevicePointInfo.EndPointName, getPowerDevicePointInfo.RequestData{ Id: psId }, DefaultCacheTimeout) // if sg.Error != nil { @@ -234,7 +228,6 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { // } // points.AppendMap(data) - // // queryDeviceRealTimeDataByPsKeys // ep = sg.GetByStruct(queryDeviceRealTimeDataByPsKeys.EndPointName, queryDeviceRealTimeDataByPsKeys.RequestData{ PsKeyList: psId }, DefaultCacheTimeout) // if sg.Error != nil { @@ -256,7 +249,6 @@ func (sg *SunGrow) GetAllPointsData(psIds ...string) error { return sg.Error } - // DevicePointAttrs - Return all points associated with psIds and device_type filter. func (sg *SunGrow) DevicePointAttrs(psIds []string, deviceType string) (getDevicePointAttrs.Points, error) { var points getDevicePointAttrs.Points @@ -335,12 +327,12 @@ func (sg *SunGrow) GetDevicePointAttrs(psId valueTypes.PsId) (getDevicePointAttr for _, pid := range tree.Devices { ep := sg.GetByStruct(getDevicePointAttrs.EndPointName, - getDevicePointAttrs.RequestData { + getDevicePointAttrs.RequestData{ Uuid: pid.UUID, PsId2: pid.PsId, DeviceType2: pid.DeviceType, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -355,7 +347,6 @@ func (sg *SunGrow) GetDevicePointAttrs(psId valueTypes.PsId) (getDevicePointAttr return ret, sg.Error } - func (sg *SunGrow) PointData(startDate string, endDate string, interval string, points ...string) error { for range Only.Once { // _, _ = sg.QueryMultiPointDataList( @@ -384,10 +375,10 @@ func (sg *SunGrow) PointData(startDate string, endDate string, interval string, // _, _ = fmt.Fprintf(os.Stderr,"Points: %s\n", strings.Join(points, " ")) data.SetArgs( - "StartTimeStamp:" + sd.Format(valueTypes.DateTimeLayoutSecond), - "EndTimeStamp:" + ed.Format(valueTypes.DateTimeLayoutSecond), - "MinuteInterval:" + interval, - "Points:" + strings.Join(points, ","), + "StartTimeStamp:"+sd.Format(valueTypes.DateTimeLayoutSecond), + "EndTimeStamp:"+ed.Format(valueTypes.DateTimeLayoutSecond), + "MinuteInterval:"+interval, + "Points:"+strings.Join(points, ","), ) data.SetEndpoints(queryMutiPointDataList.EndPointName) @@ -465,23 +456,22 @@ func (sg *SunGrow) PointScan(min string, max string) (string, error) { return ret, sg.Error } - func PrintPause(index int64, max int) { for range Only.Once { if index == 0 { - _, _ = fmt.Fprintf(os.Stderr,"\n%.3d ", index) + _, _ = fmt.Fprintf(os.Stderr, "\n%.3d ", index) break } m := math.Mod(float64(index), float64(max)) if m == 0 { - _, _ = fmt.Fprintf(os.Stderr,"PAUSE") + _, _ = fmt.Fprintf(os.Stderr, "PAUSE") time.Sleep(time.Millisecond * 500) // fmt.Printf("\r%s%.3d ", strings.Repeat(" ", 4), pni) - _, _ = fmt.Fprintf(os.Stderr,"\r%.3d ", index) + _, _ = fmt.Fprintf(os.Stderr, "\r%.3d ", index) } else { time.Sleep(time.Millisecond * 100) - _, _ = fmt.Fprintf(os.Stderr,".") + _, _ = fmt.Fprintf(os.Stderr, ".") } } } @@ -522,15 +512,15 @@ func (sg *SunGrow) QueryMultiPointDataList(startDate valueTypes.DateTime, endDat ep := sg.GetByStruct( "AppService.queryMutiPointDataList", - queryMutiPointDataList.RequestData { - PsId: psId, + queryMutiPointDataList.RequestData{ + PsId: psId, StartTimeStamp: startDate, - EndTimeStamp: endDate, + EndTimeStamp: endDate, MinuteInterval: interval, - PsKeys: *points.PsKeys(), - Points: points, + PsKeys: *points.PsKeys(), + Points: points, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -545,9 +535,9 @@ func (sg *SunGrow) QueryMultiPointDataList(startDate valueTypes.DateTime, endDat break } - response.Options = OutputOptions { - OutputType: sg.OutputType, - SaveAsFile: sg.SaveAsFile, + response.Options = OutputOptions{ + OutputType: sg.OutputType, + SaveAsFile: sg.SaveAsFile, GraphRequest: output.GraphRequest{}, } diff --git a/iSolarCloud/highlevel_ps.go b/iSolarCloud/highlevel_ps.go index cc8a972be..84661b343 100644 --- a/iSolarCloud/highlevel_ps.go +++ b/iSolarCloud/highlevel_ps.go @@ -1,58 +1,58 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/findPsType" - "GoSungrow/iSolarCloud/AppService/getChnnlListByPsId" - "GoSungrow/iSolarCloud/AppService/getDeviceList" - "GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" - "GoSungrow/iSolarCloud/AppService/getIncomeSettingInfos" - "GoSungrow/iSolarCloud/AppService/getPListinfoFromMysql" - "GoSungrow/iSolarCloud/AppService/getPowerChargeSettingInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStationBasicInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStationData" - "GoSungrow/iSolarCloud/AppService/getPowerStationForHousehold" - "GoSungrow/iSolarCloud/AppService/getPowerStationInfo" - "GoSungrow/iSolarCloud/AppService/getPowerStatistics" - "GoSungrow/iSolarCloud/AppService/getPsDetail" - "GoSungrow/iSolarCloud/AppService/getPsDetailForSinglePage" - "GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" - "GoSungrow/iSolarCloud/AppService/getPsHealthState" - "GoSungrow/iSolarCloud/AppService/getPsInstallerByPsId" - "GoSungrow/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId" - "GoSungrow/iSolarCloud/AppService/getPsList" - "GoSungrow/iSolarCloud/AppService/getPsWeatherList" - "GoSungrow/iSolarCloud/AppService/getRemoteUpgradeTaskList" - "GoSungrow/iSolarCloud/AppService/getReportData" - "GoSungrow/iSolarCloud/AppService/psForcastInfo" - "GoSungrow/iSolarCloud/AppService/psHourPointsValue" - "GoSungrow/iSolarCloud/AppService/queryAllPsIdAndName" - "GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" - "GoSungrow/iSolarCloud/AppService/queryPowerStationInfo" - "GoSungrow/iSolarCloud/AppService/queryPsIdList" - "GoSungrow/iSolarCloud/AppService/queryPsProfit" - "GoSungrow/iSolarCloud/AppService/queryPsStructureList" - "GoSungrow/iSolarCloud/AppService/querySysAdvancedParam" - "GoSungrow/iSolarCloud/AppService/reportList" - "GoSungrow/iSolarCloud/Common" - "GoSungrow/iSolarCloud/MttvScreenService/getPsDeviceListValue" - "GoSungrow/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId" - "GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" - "GoSungrow/iSolarCloud/WebAppService/getPsIdState" - "GoSungrow/iSolarCloud/WebAppService/getReportPsTree" - "GoSungrow/iSolarCloud/WebAppService/showPSView" - "GoSungrow/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId" - "GoSungrow/iSolarCloud/WebIscmAppService/getPsTreeMenu" - "GoSungrow/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "fmt" - "github.com/MickMake/GoUnify/Only" - datatable "go.pennock.tech/tabular/auto" "os" "sort" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/findPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getChnnlListByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getHouseholdStoragePsReport" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getIncomeSettingInfos" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPListinfoFromMysql" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerChargeSettingInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationBasicInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationForHousehold" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPowerStatistics" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetail" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailForSinglePage" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsDetailWithPsType" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsHealthState" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsInstallerByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getPsWeatherList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getRemoteUpgradeTaskList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getReportData" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/psForcastInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/psHourPointsValue" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryAllPsIdAndName" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryDeviceListForApp" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPowerStationInfo" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsIdList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsProfit" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/queryPsStructureList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/querySysAdvancedParam" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/reportList" + "github.com/MickMake/GoSungrow/iSolarCloud/Common" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsDeviceListValue" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getDevicePointAttrs" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getPsIdState" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/getReportPsTree" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/showPSView" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/getPsTreeMenu" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" + datatable "go.pennock.tech/tabular/auto" +) // PsList - Return all ps_ids. func (sg *SunGrow) PsList(psIds ...string) (string, error) { @@ -205,7 +205,6 @@ func (sg *SunGrow) PsPointsData(psIds []string, deviceType string, startDate str return sg.Error } - func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { var ret valueTypes.PsKeys @@ -222,7 +221,6 @@ func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { // AppService.queryDeviceInfoForApp DeviceSn:B2281302388 - Needs UUID. // getDeviceList - Doesn't return the parent device. - // -------------------------------------------------------------------------------- // // Method 1: WebIscmAppService.queryDeviceListForBackSys - Missing values. // pids := sg.GetDevices() @@ -234,7 +232,6 @@ func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { // fmt.Printf("%s_%s_%s_%s\n", "UUID", pid.DeviceType, pid.DeviceCode, pid.ChannelId) // } - // -------------------------------------------------------------------------------- // // Method 2: PsTreeMenu var tree PsTree @@ -251,7 +248,6 @@ func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { break } - // -------------------------------------------------------------------------------- // // Method 3: AppService.getDeviceList - Around 7kB pids2, _ := sg.GetDeviceList() @@ -267,7 +263,6 @@ func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { break } - // -------------------------------------------------------------------------------- // // Method 4: AppService.getPsList - Around 8.5kB - Doesn't return any pid.DeviceType, pid.DeviceCode, pid.ChannelId // pids4, _ := sg.GetPsList() @@ -285,7 +280,6 @@ func (sg *SunGrow) GetPsKeys() (valueTypes.PsKeys, error) { // break // } - // -------------------------------------------------------------------------------- // // Method 5: AppService.queryDeviceList - Around 118kB pids3, _ := sg.QueryDeviceList() @@ -410,7 +404,6 @@ func (sg *SunGrow) GetPsIds() (valueTypes.PsIds, error) { // return ret, sg.Error // } - // PsTreeMenu - WebIscmAppService.getPsTreeMenu func (sg *SunGrow) PsTreeMenu(psIds ...string) (PsTree, error) { var ret PsTree @@ -440,6 +433,7 @@ func (sg *SunGrow) PsTreeMenu(psIds ...string) (PsTree, error) { } const Root = "0" + type Ps struct { Children []getPsTreeMenu.Ps Depth int @@ -480,8 +474,8 @@ func (p *PsTree) Scan(devices []getPsTreeMenu.Ps, print bool) { name := ps.UpUUID.String() // fmt.Printf("[%s]\tParent:%s\tSelf: - %s\t%s\t%s\t%s\n", name, ps.UpUUID, ps.UUID, ps.PsId, ps.PsKey, ps.DeviceName) if _, ok := p.Map[name]; !ok { - p.Map[name] = &Ps { - Children: []getPsTreeMenu.Ps{ ps}, + p.Map[name] = &Ps{ + Children: []getPsTreeMenu.Ps{ps}, } } else { p.Map[name].Children = append(p.Map[name].Children, ps) @@ -504,7 +498,7 @@ func (p *PsTree) loop(current string, count int, depth int) { for _, child := range p.Map[current].Children { p.Stringer += fmt.Sprintf("%s\tPsId:%s\tPsName:%s\tPsKey:%s\tDeviceName:%s\tUuid:%s\n", - "+" + strings.Repeat("--", depth), + "+"+strings.Repeat("--", depth), child.PsId, child.PsName, child.PsKey, child.DeviceName, child.UUID) @@ -515,7 +509,6 @@ func (p *PsTree) loop(current string, count int, depth int) { } } - // QueryDeviceListForBackSys - WebIscmAppService.queryDeviceListForBackSys func (sg *SunGrow) QueryDeviceListForBackSys(psId string) ([]queryDeviceListForBackSys.Device, error) { var ret []queryDeviceListForBackSys.Device @@ -528,7 +521,7 @@ func (sg *SunGrow) QueryDeviceListForBackSys(psId string) ([]queryDeviceListForB } ep := sg.GetByStruct(queryDeviceListForBackSys.EndPointName, - queryDeviceListForBackSys.RequestData{ PsId: pid }, + queryDeviceListForBackSys.RequestData{PsId: pid}, DefaultCacheTimeout) if sg.IsError() { break @@ -562,11 +555,11 @@ func (sg *SunGrow) QueryPowerStationInfo(psId valueTypes.PsId, sn valueTypes.Str var ret queryPowerStationInfo.ResultData for range Only.Once { ep := sg.GetByStruct(queryPowerStationInfo.EndPointName, - queryPowerStationInfo.RequestData { + queryPowerStationInfo.RequestData{ PsId: psId, - Sn: sn, + Sn: sn, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -583,8 +576,8 @@ func (sg *SunGrow) QueryPsIdList() ([]valueTypes.String, error) { var ret []valueTypes.String for range Only.Once { ep := sg.GetByStruct(queryPsIdList.EndPointName, - queryPsIdList.RequestData {}, - time.Hour * 24, + queryPsIdList.RequestData{}, + time.Hour*24, ) if sg.IsError() { break @@ -601,10 +594,10 @@ func (sg *SunGrow) GetPsInstallerOrgInfoByPsId(psId valueTypes.PsId) (getPsInsta var ret getPsInstallerOrgInfoByPsId.ResultData for range Only.Once { ep := sg.GetByStruct(getPsInstallerOrgInfoByPsId.EndPointName, - getPsInstallerOrgInfoByPsId.RequestData { + getPsInstallerOrgInfoByPsId.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -621,10 +614,10 @@ func (sg *SunGrow) GetPListinfoFromMysql(psIds valueTypes.PsIds) (getPListinfoFr var ret getPListinfoFromMysql.ResultData for range Only.Once { ep := sg.GetByStruct(getPListinfoFromMysql.EndPointName, - getPListinfoFromMysql.RequestData { + getPListinfoFromMysql.RequestData{ PsIds: psIds, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -641,8 +634,8 @@ func (sg *SunGrow) QueryAllPsIdAndName() (queryAllPsIdAndName.ResultData, error) var ret queryAllPsIdAndName.ResultData for range Only.Once { ep := sg.GetByStruct(queryAllPsIdAndName.EndPointName, - queryAllPsIdAndName.RequestData {}, - time.Hour * 24, + queryAllPsIdAndName.RequestData{}, + time.Hour*24, ) if sg.IsError() { break @@ -660,10 +653,10 @@ func (sg *SunGrow) getRemoteUpgradeTaskList(psId valueTypes.PsIds) (getRemoteUpg for range Only.Once { ep := sg.GetByStruct( "WebAppService.getRemoteUpgradeTaskList", - getRemoteUpgradeTaskList.RequestData { + getRemoteUpgradeTaskList.RequestData{ PsIdList: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -680,12 +673,12 @@ func (sg *SunGrow) QuerySysAdvancedParam(psId valueTypes.PsId, curPage valueType var ret querySysAdvancedParam.ResultData for range Only.Once { ep := sg.GetByStruct(querySysAdvancedParam.EndPointName, - querySysAdvancedParam.RequestData { - PsId2: psId, + querySysAdvancedParam.RequestData{ + PsId2: psId, CurPage: curPage, - Size: size, + Size: size, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -705,7 +698,7 @@ func (sg *SunGrow) GetPsInstallerByPsId(psId valueTypes.PsId) (getPsInstallerByP getPsInstallerByPsId.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -722,10 +715,10 @@ func (sg *SunGrow) FindPsType(psId valueTypes.PsId) (findPsType.ResultData, erro var ret findPsType.ResultData for range Only.Once { ep := sg.GetByStruct(findPsType.EndPointName, - findPsType.RequestData { + findPsType.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -742,10 +735,10 @@ func (sg *SunGrow) GetChannelListByPsId(psId valueTypes.PsId) (getChnnlListByPsI var ret getChnnlListByPsId.ResultData for range Only.Once { ep := sg.GetByStruct(getChnnlListByPsId.EndPointName, - getChnnlListByPsId.RequestData { + getChnnlListByPsId.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -763,12 +756,12 @@ func (sg *SunGrow) GetHouseholdStoragePsReport(psId valueTypes.PsId, dateId valu var ret getHouseholdStoragePsReport.ResultData for range Only.Once { ep := sg.GetByStruct(getHouseholdStoragePsReport.EndPointName, - getHouseholdStoragePsReport.RequestData { - PsId: psId, - DateId: dateId, + getHouseholdStoragePsReport.RequestData{ + PsId: psId, + DateId: dateId, DateType: valueTypes.SetStringValue(dateId.DateType), }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -786,10 +779,10 @@ func (sg *SunGrow) GetIncomeSettingInfos(psId valueTypes.PsId) (getIncomeSetting var ret getIncomeSettingInfos.ResultData for range Only.Once { ep := sg.GetByStruct(getIncomeSettingInfos.EndPointName, - getIncomeSettingInfos.RequestData { + getIncomeSettingInfos.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -807,10 +800,10 @@ func (sg *SunGrow) GetPowerChargeSettingInfo(psId valueTypes.PsId) (getPowerChar var ret getPowerChargeSettingInfo.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerChargeSettingInfo.EndPointName, - getPowerChargeSettingInfo.RequestData { + getPowerChargeSettingInfo.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -828,10 +821,10 @@ func (sg *SunGrow) GetPowerStationBasicInfo(psId valueTypes.PsId) (getPowerStati var ret getPowerStationBasicInfo.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerStationBasicInfo.EndPointName, - getPowerStationBasicInfo.RequestData { + getPowerStationBasicInfo.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -849,12 +842,12 @@ func (sg *SunGrow) GetPowerStationData(psId valueTypes.PsId, dateId valueTypes.D var ret getPowerStationData.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerStationData.EndPointName, - getPowerStationData.RequestData { - PsId: psId, - DateId: dateId, + getPowerStationData.RequestData{ + PsId: psId, + DateId: dateId, DateType: valueTypes.SetStringValue(dateId.DateType), }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -872,10 +865,10 @@ func (sg *SunGrow) GetPowerStationForHousehold(psId valueTypes.PsId) (getPowerSt var ret getPowerStationForHousehold.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerStationForHousehold.EndPointName, - getPowerStationForHousehold.RequestData { + getPowerStationForHousehold.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -893,10 +886,10 @@ func (sg *SunGrow) GetPowerStationInfo(psId valueTypes.PsId) (getPowerStationInf var ret getPowerStationInfo.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerStationInfo.EndPointName, - getPowerStationInfo.RequestData { + getPowerStationInfo.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -914,10 +907,10 @@ func (sg *SunGrow) GetPowerStatistics(psId valueTypes.PsId) (getPowerStatistics. var ret getPowerStatistics.ResultData for range Only.Once { ep := sg.GetByStruct(getPowerStatistics.EndPointName, - getPowerStatistics.RequestData { + getPowerStatistics.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -935,10 +928,10 @@ func (sg *SunGrow) GetPsDetail(psId valueTypes.PsId) (getPsDetail.ResultData, er var ret getPsDetail.ResultData for range Only.Once { ep := sg.GetByStruct(getPsDetail.EndPointName, - getPsDetail.RequestData { + getPsDetail.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -956,10 +949,10 @@ func (sg *SunGrow) GetPsDetailForSinglePage(psId valueTypes.PsId) (getPsDetailFo var ret getPsDetailForSinglePage.ResultData for range Only.Once { ep := sg.GetByStruct(getPsDetailForSinglePage.EndPointName, - getPsDetailForSinglePage.RequestData { + getPsDetailForSinglePage.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -977,10 +970,10 @@ func (sg *SunGrow) GetPsDetailWithPsType(psId valueTypes.PsId) (getPsDetailWithP var ret getPsDetailWithPsType.ResultData for range Only.Once { ep := sg.GetByStruct(getPsDetailWithPsType.EndPointName, - getPsDetailWithPsType.RequestData { + getPsDetailWithPsType.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -998,10 +991,10 @@ func (sg *SunGrow) GetPsHealthState(psId valueTypes.PsId) (getPsHealthState.Resu var ret getPsHealthState.ResultData for range Only.Once { ep := sg.GetByStruct(getPsHealthState.EndPointName, - getPsHealthState.RequestData { + getPsHealthState.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1019,10 +1012,10 @@ func (sg *SunGrow) GetPsWeatherList(psId valueTypes.PsId) (getPsWeatherList.Resu var ret getPsWeatherList.ResultData for range Only.Once { ep := sg.GetByStruct(getPsWeatherList.EndPointName, - getPsWeatherList.RequestData { + getPsWeatherList.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1040,11 +1033,11 @@ func (sg *SunGrow) GetReportData(psId valueTypes.PsId, reportType int64) (getRep var ret getReportData.ResultData for range Only.Once { ep := sg.GetByStruct(getReportData.EndPointName, - getReportData.RequestData { - PsId: psId, + getReportData.RequestData{ + PsId: psId, ReportType: valueTypes.SetIntegerValue(reportType), }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1062,10 +1055,10 @@ func (sg *SunGrow) GetPsForecastInfo(psId valueTypes.PsId) (psForcastInfo.Result var ret psForcastInfo.ResultData for range Only.Once { ep := sg.GetByStruct(psForcastInfo.EndPointName, - psForcastInfo.RequestData { + psForcastInfo.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1083,10 +1076,10 @@ func (sg *SunGrow) GetPsHourPointsValue(psId valueTypes.PsId) (psHourPointsValue var ret psHourPointsValue.ResultData for range Only.Once { ep := sg.GetByStruct(psHourPointsValue.EndPointName, - psHourPointsValue.RequestData { + psHourPointsValue.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1104,10 +1097,10 @@ func (sg *SunGrow) QueryDeviceListForApp(psId valueTypes.PsId) (queryDeviceListF var ret queryDeviceListForApp.ResultData for range Only.Once { ep := sg.GetByStruct(queryDeviceListForApp.EndPointName, - queryDeviceListForApp.RequestData { + queryDeviceListForApp.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1125,12 +1118,12 @@ func (sg *SunGrow) QueryPsProfit(psId valueTypes.PsId, dateId valueTypes.DateTim var ret queryPsProfit.ResultData for range Only.Once { ep := sg.GetByStruct(queryPsProfit.EndPointName, - queryPsProfit.RequestData { - PsId: psId, - DateId: dateId, + queryPsProfit.RequestData{ + PsId: psId, + DateId: dateId, DateType: valueTypes.SetStringValue(dateId.DateType), }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1148,10 +1141,10 @@ func (sg *SunGrow) QueryPsStructureList(psId valueTypes.PsId) (queryPsStructureL var ret queryPsStructureList.ResultData for range Only.Once { ep := sg.GetByStruct(queryPsStructureList.EndPointName, - queryPsStructureList.RequestData { + queryPsStructureList.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1169,11 +1162,11 @@ func (sg *SunGrow) ReportList(psId valueTypes.PsId, reportType int64) (reportLis var ret reportList.ResultData for range Only.Once { ep := sg.GetByStruct(reportList.EndPointName, - reportList.RequestData { - PsId: psId, + reportList.RequestData{ + PsId: psId, ReportType: valueTypes.SetIntegerValue(reportType), }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1191,10 +1184,10 @@ func (sg *SunGrow) GetPsDeviceListValue(psId valueTypes.PsId) (getPsDeviceListVa var ret getPsDeviceListValue.ResultData for range Only.Once { ep := sg.GetByStruct(getPsDeviceListValue.EndPointName, - getPsDeviceListValue.RequestData { + getPsDeviceListValue.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1212,10 +1205,10 @@ func (sg *SunGrow) GetPsKpiForHoursByPsId(psId valueTypes.PsId) (getPsKpiForHour var ret getPsKpiForHoursByPsId.ResultData for range Only.Once { ep := sg.GetByStruct(getPsKpiForHoursByPsId.EndPointName, - getPsKpiForHoursByPsId.RequestData { + getPsKpiForHoursByPsId.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1233,10 +1226,10 @@ func (sg *SunGrow) GetPsIdState(psId valueTypes.PsId) (getPsIdState.ResultData, var ret getPsIdState.ResultData for range Only.Once { ep := sg.GetByStruct(getPsIdState.EndPointName, - getPsIdState.RequestData { + getPsIdState.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1254,10 +1247,10 @@ func (sg *SunGrow) GetReportPsTree(psId valueTypes.PsId) (getReportPsTree.Result var ret getReportPsTree.ResultData for range Only.Once { ep := sg.GetByStruct(getReportPsTree.EndPointName, - getReportPsTree.RequestData { + getReportPsTree.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1275,10 +1268,10 @@ func (sg *SunGrow) ShowPSView(psId valueTypes.PsId) (showPSView.ResultData, erro var ret showPSView.ResultData for range Only.Once { ep := sg.GetByStruct(showPSView.EndPointName, - showPSView.RequestData { + showPSView.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1296,10 +1289,10 @@ func (sg *SunGrow) GetMaxDeviceIdByPsId(psId valueTypes.PsId) (getMaxDeviceIdByP var ret getMaxDeviceIdByPsId.ResultData for range Only.Once { ep := sg.GetByStruct(getMaxDeviceIdByPsId.EndPointName, - getMaxDeviceIdByPsId.RequestData { + getMaxDeviceIdByPsId.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1317,10 +1310,10 @@ func (sg *SunGrow) GetPsTreeMenu(psId valueTypes.PsId) (getPsTreeMenu.ResultData var ret getPsTreeMenu.ResultData for range Only.Once { ep := sg.GetByStruct(getPsTreeMenu.EndPointName, - getPsTreeMenu.RequestData { + getPsTreeMenu.RequestData{ PsId: psId, }, - time.Hour * 24, + time.Hour*24, ) if sg.IsError() { break @@ -1333,7 +1326,6 @@ func (sg *SunGrow) GetPsTreeMenu(psId valueTypes.PsId) (getPsTreeMenu.ResultData return ret, sg.Error } - // // getRobotDynamicCleaningView - AppService.getRobotDynamicCleaningView // func (sg *SunGrow) getRobotDynamicCleaningView(psId valueTypes.PsId) (getRobotDynamicCleaningView.ResultData, error) { // var ret getRobotDynamicCleaningView.ResultData diff --git a/iSolarCloud/highlevel_template.go b/iSolarCloud/highlevel_template.go index 2e22c80bf..5db206bc3 100644 --- a/iSolarCloud/highlevel_template.go +++ b/iSolarCloud/highlevel_template.go @@ -1,14 +1,14 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AppService/getTemplateList" - "GoSungrow/iSolarCloud/WebAppService/queryUserCurveTemplateData" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" - "github.com/MickMake/GoUnify/Only" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getTemplateList" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService/queryUserCurveTemplateData" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" +) // TemplateList - Return all templates. func (sg *SunGrow) TemplateList() error { @@ -198,7 +198,6 @@ func (sg *SunGrow) TemplateData(template string, startDate string, endDate strin return sg.Error } - // GetTemplateList - AppService.getTemplateList func (sg *SunGrow) GetTemplateList() (getTemplateList.ResultData, error) { var ret getTemplateList.ResultData diff --git a/iSolarCloud/struct.go b/iSolarCloud/struct.go index b1adfd612..f904d85a3 100644 --- a/iSolarCloud/struct.go +++ b/iSolarCloud/struct.go @@ -1,36 +1,36 @@ package iSolarCloud import ( - "GoSungrow/iSolarCloud/AliSmsService" - "GoSungrow/iSolarCloud/AppService" - "GoSungrow/iSolarCloud/AppService/getUserList" - "GoSungrow/iSolarCloud/AppService/login" - "GoSungrow/iSolarCloud/MttvScreenService" - "GoSungrow/iSolarCloud/NullArea" - "GoSungrow/iSolarCloud/PowerPointService" - "GoSungrow/iSolarCloud/WebAppService" - "GoSungrow/iSolarCloud/WebIscmAppService" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/output" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" "os" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AliSmsService" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getUserList" + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/login" + "github.com/MickMake/GoSungrow/iSolarCloud/MttvScreenService" + "github.com/MickMake/GoSungrow/iSolarCloud/NullArea" + "github.com/MickMake/GoSungrow/iSolarCloud/PowerPointService" + "github.com/MickMake/GoSungrow/iSolarCloud/WebAppService" + "github.com/MickMake/GoSungrow/iSolarCloud/WebIscmAppService" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/output" + "github.com/MickMake/GoUnify/Only" +) const ( DefaultCacheTimeout = time.Minute * 5 ) type SunGrow struct { - ApiRoot api.Web - Auth login.EndPoint - Areas api.Areas - Error error - NeedLogin bool + ApiRoot api.Web + Auth login.EndPoint + Areas api.Areas + Error error + NeedLogin bool AuthDetails *login.SunGrowAuth OutputType output.OutputType @@ -147,39 +147,39 @@ func (sg *SunGrow) GetByJson(endpoint string, request string) api.EndPoint { } switch { - case sg.OutputType.IsNone(): - if sg.IsError() { - fmt.Println(ret.Help()) - break - } - - case sg.OutputType.IsRaw(): - // if sg.Error != nil { - // fmt.Println(ret.Help()) - // break - // } - if sg.SaveAsFile { - sg.Error = ret.WriteDataFile() - break - } - fmt.Println(ret.GetJsonData(true)) - - case sg.OutputType.IsJson(): - if sg.IsError() { - fmt.Println(ret.Help()) - break - } - if sg.SaveAsFile { - sg.Error = ret.WriteDataFile() - break - } - fmt.Println(ret.GetJsonData(false)) - - default: - if sg.IsError() { - fmt.Println(ret.Help()) - break - } + case sg.OutputType.IsNone(): + if sg.IsError() { + fmt.Println(ret.Help()) + break + } + + case sg.OutputType.IsRaw(): + // if sg.Error != nil { + // fmt.Println(ret.Help()) + // break + // } + if sg.SaveAsFile { + sg.Error = ret.WriteDataFile() + break + } + fmt.Println(ret.GetJsonData(true)) + + case sg.OutputType.IsJson(): + if sg.IsError() { + fmt.Println(ret.Help()) + break + } + if sg.SaveAsFile { + sg.Error = ret.WriteDataFile() + break + } + fmt.Println(ret.GetJsonData(false)) + + default: + if sg.IsError() { + fmt.Println(ret.Help()) + break + } } } return ret @@ -261,19 +261,19 @@ func (sg *SunGrow) SplitEndPoint(ae string) (api.AreaName, api.EndPointName) { for range Only.Once { s := strings.Split(ae, ".") switch len(s) { - case 0: - sg.Error = errors.New("empty endpoint") + case 0: + sg.Error = errors.New("empty endpoint") - case 1: - area = "AppService" - endpoint = api.EndPointName(s[0]) + case 1: + area = "AppService" + endpoint = api.EndPointName(s[0]) - case 2: - area = api.AreaName(s[0]) - endpoint = api.EndPointName(s[1]) + case 2: + area = api.AreaName(s[0]) + endpoint = api.EndPointName(s[1]) - default: - sg.Error = errors.New("too many delimiters defined, (only one '.' allowed)") + default: + sg.Error = errors.New("too many delimiters defined, (only one '.' allowed)") } } @@ -321,7 +321,7 @@ func (sg *SunGrow) Login(auth login.SunGrowAuth) error { // Fetch a simple request. for range Only.Twice { - sg.Error = nil // Needed for looping twice. + sg.Error = nil // Needed for looping twice. sg.Error = sg.login() if sg.Error == nil { // - DO NOT BREAK @@ -338,7 +338,7 @@ func (sg *SunGrow) Login(auth login.SunGrowAuth) error { break } - _, _ = fmt.Fprintf(os.Stderr,"Logging in again\n") + _, _ = fmt.Fprintf(os.Stderr, "Logging in again\n") // fmt.Printf("DEBUG: AppService.getUserList - error - %s\n", sg.Error) } diff --git a/main.go b/main.go index 828e84d87..483a81cd0 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,11 @@ package main import ( - "GoSungrow/cmd" "fmt" "os" -) + "github.com/MickMake/GoSungrow/cmd" +) func main() { err := cmd.Execute() diff --git a/mmHa/options.go b/mmHa/options.go index 95cc237d9..5f8d6ac6a 100644 --- a/mmHa/options.go +++ b/mmHa/options.go @@ -1,14 +1,14 @@ package mmHa import ( - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "errors" + "sync" + + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "github.com/MickMake/GoUnify/Only" mqtt "github.com/eclipse/paho.mqtt.golang" - "sync" ) - type Options struct { mu sync.Mutex Map map[string]Option @@ -20,7 +20,6 @@ type Option struct { Values []string } - func (m *Mqtt) SetOption(id string, name string, fn mqtt.MessageHandler, options ...string) error { for range Only.Once { m.err = m.UserOptions.SetOption(id, name, fn, options...) @@ -59,7 +58,6 @@ func (m *Mqtt) GetOption(id string) string { return m.UserOptions.GetOption(id) } - const OptionEnabled = "Enabled" const OptionDisabled = "Disabled" @@ -84,11 +82,11 @@ func (m *Options) SetOption(id string, name string, handler mqtt.MessageHandler, //goland:noinspection GoDeferInLoop defer m.mu.Unlock() - m.Map[id] = Option { - Config: &EntityConfig { - Name: "Option " + name, - FullId: JoinStringsForId("option", id), - Icon: "mdi:format-list-group", + m.Map[id] = Option{ + Config: &EntityConfig{ + Name: "Option " + name, + FullId: JoinStringsForId("option", id), + Icon: "mdi:format-list-group", // ValueTemplate: `{"value": "{{ value }}"}`, ValueTemplate: `{{ value }}`, Units: LabelSelect, diff --git a/mmHa/struct.go b/mmHa/struct.go index 1c4f31e5b..ff795ee67 100644 --- a/mmHa/struct.go +++ b/mmHa/struct.go @@ -1,29 +1,29 @@ package mmHa import ( - "GoSungrow/iSolarCloud/AppService/getDeviceList" - "GoSungrow/iSolarCloud/api" - "GoSungrow/iSolarCloud/api/GoStruct/valueTypes" "encoding/json" "errors" "fmt" - "github.com/MickMake/GoUnify/Only" - "github.com/MickMake/GoUnify/cmdLog" - mqtt "github.com/eclipse/paho.mqtt.golang" "net/url" "strings" "time" -) + "github.com/MickMake/GoSungrow/iSolarCloud/AppService/getDeviceList" + "github.com/MickMake/GoSungrow/iSolarCloud/api" + "github.com/MickMake/GoSungrow/iSolarCloud/api/GoStruct/valueTypes" + "github.com/MickMake/GoUnify/Only" + "github.com/MickMake/GoUnify/cmdLog" + mqtt "github.com/eclipse/paho.mqtt.golang" +) type Mqtt struct { - ClientId string `json:"client_id"` - Username string `json:"username"` - Password string `json:"password"` - Host string `json:"host"` - Port string `json:"port"` - Timeout time.Duration `json:"timeout"` - EntityPrefix string `json:"entity_prefix"` + ClientId string `json:"client_id"` + Username string `json:"username"` + Password string `json:"password"` + Host string `json:"host"` + Port string `json:"port"` + Timeout time.Duration `json:"timeout"` + EntityPrefix string `json:"entity_prefix"` url *url.URL client mqtt.Client @@ -44,7 +44,6 @@ type Mqtt struct { debug bool } - func New(req Mqtt) *Mqtt { var ret Mqtt @@ -77,7 +76,7 @@ func (m *Mqtt) IsDebug() bool { return m.debug } -func (m *Mqtt) LogDebug(format string, args ...interface{}) { +func (m *Mqtt) LogDebug(format string, args ...interface{}) { if !m.debug { return } @@ -152,7 +151,7 @@ func (m *Mqtt) setUrl(req Mqtt) error { m.Password, m.Host, m.Port, - ) + ) m.url, m.err = url.Parse(u) } @@ -196,12 +195,12 @@ func (m *Mqtt) Connect() error { m.ClientId = "GoSungrow" } - device := Config { - Entry: JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId), // m.servicePrefix + device := Config{ + Entry: JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId), // m.servicePrefix Name: m.ClientId, - UniqueId: m.ClientId, // + "_Service", - StateTopic: "~/state", - DeviceConfig: DeviceConfig { + UniqueId: m.ClientId, // + "_Service", + StateTopic: "~/state", + DeviceConfig: DeviceConfig{ Identifiers: []string{"GoSungrow"}, SwVersion: "GoSungrow https://github.com/MickMake/GoSungrow", Name: m.ClientId + " Service", @@ -320,40 +319,40 @@ func (m *Mqtt) PublishValue(Type string, subtopic string, value string) error { for range Only.Once { topic := "" switch Type { - case LabelSensor: - topic = JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId, subtopic, "state") - // state := MqttState { - // LastReset: "", // m.GetLastReset(point.PointId), - // Value: value, - // } - // value = state.Json() - - case "binary_sensor": - topic = JoinStringsForTopic(m.Prefix, LabelBinarySensor, m.ClientId, subtopic, "state") - // state := MqttState { - // LastReset: "", // m.GetLastReset(point.PointId), - // Value: value, - // } - // value = state.Json() - - case "lights": - topic = JoinStringsForTopic(m.Prefix, LabelLight, m.ClientId, subtopic, "state") - // state := MqttState { - // LastReset: "", // m.GetLastReset(point.PointId), - // Value: value, - // } - // value = state.Json() - - case LabelSwitch: - topic = JoinStringsForTopic(m.Prefix, LabelSwitch, m.ClientId, subtopic, "state") - // state := MqttState { - // LastReset: "", // m.GetLastReset(point.PointId), - // Value: value, - // } - // value = state.Json() - - default: - topic = JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId, subtopic, "state") + case LabelSensor: + topic = JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId, subtopic, "state") + // state := MqttState { + // LastReset: "", // m.GetLastReset(point.PointId), + // Value: value, + // } + // value = state.Json() + + case "binary_sensor": + topic = JoinStringsForTopic(m.Prefix, LabelBinarySensor, m.ClientId, subtopic, "state") + // state := MqttState { + // LastReset: "", // m.GetLastReset(point.PointId), + // Value: value, + // } + // value = state.Json() + + case "lights": + topic = JoinStringsForTopic(m.Prefix, LabelLight, m.ClientId, subtopic, "state") + // state := MqttState { + // LastReset: "", // m.GetLastReset(point.PointId), + // Value: value, + // } + // value = state.Json() + + case LabelSwitch: + topic = JoinStringsForTopic(m.Prefix, LabelSwitch, m.ClientId, subtopic, "state") + // state := MqttState { + // LastReset: "", // m.GetLastReset(point.PointId), + // Value: value, + // } + // value = state.Json() + + default: + topic = JoinStringsForTopic(m.Prefix, LabelSensor, m.ClientId, subtopic, "state") } m.LogDebug("PublishValue - topic: '%s'\tpayload: '%s'\n", topic, value) @@ -382,14 +381,14 @@ func (m *Mqtt) SetDeviceConfig(swname string, parentId string, id string, name s } } - ret = Device { - Connections: c, - Identifiers: []string{JoinStringsForId(m.EntityPrefix, id)}, - Manufacturer: vendor, - Model: model, - Name: name, - SwVersion: swname + " https://github.com/MickMake/" + swname, - ViaDevice: swname, + ret = Device{ + Connections: c, + Identifiers: []string{JoinStringsForId(m.EntityPrefix, id)}, + Manufacturer: vendor, + Model: model, + Name: name, + SwVersion: swname + " https://github.com/MickMake/" + swname, + ViaDevice: swname, SuggestedArea: area, } m.MqttDevices[id] = ret @@ -415,10 +414,9 @@ func (m *Mqtt) SetDeviceConfig(swname string, parentId string, id string, name s // return ret // } - type MqttState struct { LastReset string `json:"last_reset,omitempty"` - Value string `json:"value"` + Value string `json:"value"` } func (mq *MqttState) Json() string { @@ -438,32 +436,32 @@ type SensorState string type EntityConfig struct { // Type string - Name string - SubName string + Name string + SubName string - ParentId string - ParentName string + ParentId string + ParentName string - UniqueId string - FullId string - Units string - ValueName string - DeviceClass string - StateClass string - Icon string + UniqueId string + FullId string + Units string + ValueName string + DeviceClass string + StateClass string + Icon string Value *valueTypes.UnitValue Point *api.Point ValueTemplate string - UpdateFreq string - LastReset string + UpdateFreq string + LastReset string LastResetValueTemplate string - IgnoreUpdate bool + IgnoreUpdate bool - haType string - Options []string + haType string + Options []string } func (config *EntityConfig) FixConfig() { @@ -483,239 +481,239 @@ func (config *EntityConfig) FixConfig() { // Set ValueTemplate switch { - // fallthrough - // - // case config.Value.TypeValue == "Energy": - // fallthrough - // - // case config.Units == "MW": - // fallthrough - // case config.Units == "kW": - // fallthrough - // case config.Units == "W": - // fallthrough - // - // case config.Units == "kWp": - // fallthrough - // case config.Units == "MWh": - // fallthrough - // case config.Units == "kWh": - // fallthrough - // case config.Units == "Wh": - // fallthrough - // - // case config.Units == "kvar": - // fallthrough - // case config.Units == "Hz": - // fallthrough - // case config.Units == "V": - // fallthrough - // case config.Units == "A": - // fallthrough - // case config.Units == "°F": - // fallthrough - // case config.Units == "F": - // fallthrough - // case config.Units == "℉": - // fallthrough - // case config.Units == "°C": - // fallthrough - // case config.Units == "C": - // fallthrough - // case config.Units == "℃": - // fallthrough - // case config.Units == "%": - case config.Value.IsFloat(): - if !config.Value.Valid { - config.IgnoreUpdate = true - } - cnv := "| float" - if config.Value.String() == "" { - cnv = "" - } - if config.ValueName == "" { - config.ValueTemplate = SetDefault(config.ValueTemplate, fmt.Sprintf("{{ value_json.value %s }}", cnv)) - } else { - config.ValueTemplate = SetDefault(config.ValueTemplate, fmt.Sprintf("{{ value_json.%s %s }}", config.ValueName, cnv)) - } - - case config.Value.IsBool(): - fallthrough - case config.Value.Unit() == LabelBinarySensor: - config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value }}") + // fallthrough + // + // case config.Value.TypeValue == "Energy": + // fallthrough + // + // case config.Units == "MW": + // fallthrough + // case config.Units == "kW": + // fallthrough + // case config.Units == "W": + // fallthrough + // + // case config.Units == "kWp": + // fallthrough + // case config.Units == "MWh": + // fallthrough + // case config.Units == "kWh": + // fallthrough + // case config.Units == "Wh": + // fallthrough + // + // case config.Units == "kvar": + // fallthrough + // case config.Units == "Hz": + // fallthrough + // case config.Units == "V": + // fallthrough + // case config.Units == "A": + // fallthrough + // case config.Units == "°F": + // fallthrough + // case config.Units == "F": + // fallthrough + // case config.Units == "℉": + // fallthrough + // case config.Units == "°C": + // fallthrough + // case config.Units == "C": + // fallthrough + // case config.Units == "℃": + // fallthrough + // case config.Units == "%": + case config.Value.IsFloat(): + if !config.Value.Valid { + config.IgnoreUpdate = true + } + cnv := "| float" + if config.Value.String() == "" { + cnv = "" + } + if config.ValueName == "" { + config.ValueTemplate = SetDefault(config.ValueTemplate, fmt.Sprintf("{{ value_json.value %s }}", cnv)) + } else { + config.ValueTemplate = SetDefault(config.ValueTemplate, fmt.Sprintf("{{ value_json.%s %s }}", config.ValueName, cnv)) + } - case config.Value.Unit() == "DateTime": - fallthrough - case config.Value.TypeValue == "DateTime": - value, _, err := valueTypes.ParseDateTime(config.Value.String()) - if err == nil { - config.Value.SetString(value.Local().Format(valueTypes.DateTimeFullLayout)) - config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value | as_datetime }}") - } else { - config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value }}") - } - - case config.Value.IsInt(): - fallthrough - default: + case config.Value.IsBool(): + fallthrough + case config.Value.Unit() == LabelBinarySensor: + config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value }}") + + case config.Value.Unit() == "DateTime": + fallthrough + case config.Value.TypeValue == "DateTime": + value, _, err := valueTypes.ParseDateTime(config.Value.String()) + if err == nil { + config.Value.SetString(value.Local().Format(valueTypes.DateTimeFullLayout)) + config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value | as_datetime }}") + } else { config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value }}") + } + + case config.Value.IsInt(): + fallthrough + default: + config.ValueTemplate = SetDefault(config.ValueTemplate, "{{ value_json.value }}") } // Set DeviceClass & Icon switch { - case config.Units == "Bool": - fallthrough - case config.Units == LabelBinarySensor: - config.DeviceClass = SetDefault(config.DeviceClass, "power") - config.Icon = SetDefault(config.Icon, "mdi:check-circle-outline") - // if !config.Value.Valid { - // config.Value = "false" - // } - - case config.Value.TypeValue == "Power": - fallthrough - case config.Units == "MW": - fallthrough - case config.Units == "kW": - fallthrough - case config.Units == "W": - config.DeviceClass = SetDefault(config.DeviceClass, "power") - config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") - - case config.Value.TypeValue == "Energy": - fallthrough - case config.Units == "MWh": - fallthrough - case config.Units == "kWh": - fallthrough - case config.Units == "Wh": - config.DeviceClass = SetDefault(config.DeviceClass, "energy") - config.Icon = SetDefault(config.Icon, "mdi:transmission-tower") - - case config.Units == "var": - fallthrough - case config.Units == "kvar": - config.DeviceClass = SetDefault(config.DeviceClass, "reactive_power") - config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") - - case config.Units == "VA": - config.DeviceClass = SetDefault(config.DeviceClass, "apparent_power") - config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") - - case config.Units == "Hz": - config.DeviceClass = SetDefault(config.DeviceClass, "frequency") - config.Icon = SetDefault(config.Icon, "mdi:sine-wave") - - case config.Units == "V": - config.DeviceClass = SetDefault(config.DeviceClass, "voltage") - config.Icon = SetDefault(config.Icon, "mdi:current-dc") - - case config.Units == "A": - config.DeviceClass = SetDefault(config.DeviceClass, "current") - config.Icon = SetDefault(config.Icon, "mdi:current-ac") - - case config.Units == "°F": - fallthrough - case config.Units == "F": - fallthrough - case config.Units == "℉": - config.DeviceClass = SetDefault(config.DeviceClass, "temperature") - config.Units = "℉" - config.Icon = SetDefault(config.Icon, "mdi:thermometer") - - case config.Units == "°C": - fallthrough - case config.Units == "C": - fallthrough - case config.Units == "℃": - config.DeviceClass = SetDefault(config.DeviceClass, "temperature") - config.Units = "°C" - config.Icon = SetDefault(config.Icon, "mdi:thermometer") - - case config.Icon == "mdi:home-battery-outline": - fallthrough - case config.Icon == "mdi:battery": - config.DeviceClass = SetDefault(config.DeviceClass, "battery") - // config.Icon = SetDefault(config.Icon, "mdi:percent") // mdi:home-battery-outline - - case config.Value.TypeValue == "Percent": - fallthrough - case config.Units == "%": - // @TODO - Not supported in older versions of HA. - // config.DeviceClass = SetDefault(config.DeviceClass, "battery") - config.Icon = SetDefault(config.Icon, "mdi:percent") // mdi:home-battery-outline - - case config.Value.TypeValue == "DateTime": - config.DeviceClass = SetDefault(config.DeviceClass, "timestamp") // date - config.Icon = SetDefault(config.Icon, "mdi:clock-outline") - - case config.Units == "h": - // config.DeviceClass = SetDefault(config.DeviceClass, "timestamp") // date - config.Icon = SetDefault(config.Icon, "mdi:clock-outline") - - case config.Units == "kg": - config.DeviceClass = SetDefault(config.DeviceClass, "weight") - config.Icon = SetDefault(config.Icon, "mdi:weight") - - case config.Units == "km": - config.DeviceClass = SetDefault(config.DeviceClass, "distance") - config.Icon = SetDefault(config.Icon, "mdi:map-marker-distance") - - case config.Units == "Wh/㎡": - fallthrough - case config.Units == "W/㎡": - // @TODO - Not supported in older versions of HA. - config.DeviceClass = SetDefault(config.DeviceClass, "irradiance") - config.Icon = SetDefault(config.Icon, "mdi:weather-sunny") - - case config.Value.TypeValue == "Currency": - fallthrough - case config.Units == "AUD": - fallthrough - case config.Units == "$": - config.DeviceClass = SetDefault(config.DeviceClass, "monetary") - config.Icon = SetDefault(config.Icon, "mdi:currency-usd") - - // p13013 - power_factor - - case config.Units == "GPS": - // config.DeviceClass = SetDefault(config.DeviceClass, "") - config.Icon = SetDefault(config.Icon, "mdi:crosshairs-gps") - - default: - config.DeviceClass = SetDefault(config.DeviceClass, "") - config.Icon = SetDefault(config.Icon, "") + case config.Units == "Bool": + fallthrough + case config.Units == LabelBinarySensor: + config.DeviceClass = SetDefault(config.DeviceClass, "power") + config.Icon = SetDefault(config.Icon, "mdi:check-circle-outline") + // if !config.Value.Valid { + // config.Value = "false" + // } + + case config.Value.TypeValue == "Power": + fallthrough + case config.Units == "MW": + fallthrough + case config.Units == "kW": + fallthrough + case config.Units == "W": + config.DeviceClass = SetDefault(config.DeviceClass, "power") + config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") + + case config.Value.TypeValue == "Energy": + fallthrough + case config.Units == "MWh": + fallthrough + case config.Units == "kWh": + fallthrough + case config.Units == "Wh": + config.DeviceClass = SetDefault(config.DeviceClass, "energy") + config.Icon = SetDefault(config.Icon, "mdi:transmission-tower") + + case config.Units == "var": + fallthrough + case config.Units == "kvar": + config.DeviceClass = SetDefault(config.DeviceClass, "reactive_power") + config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") + + case config.Units == "VA": + config.DeviceClass = SetDefault(config.DeviceClass, "apparent_power") + config.Icon = SetDefault(config.Icon, "mdi:lightning-bolt") + + case config.Units == "Hz": + config.DeviceClass = SetDefault(config.DeviceClass, "frequency") + config.Icon = SetDefault(config.Icon, "mdi:sine-wave") + + case config.Units == "V": + config.DeviceClass = SetDefault(config.DeviceClass, "voltage") + config.Icon = SetDefault(config.Icon, "mdi:current-dc") + + case config.Units == "A": + config.DeviceClass = SetDefault(config.DeviceClass, "current") + config.Icon = SetDefault(config.Icon, "mdi:current-ac") + + case config.Units == "°F": + fallthrough + case config.Units == "F": + fallthrough + case config.Units == "℉": + config.DeviceClass = SetDefault(config.DeviceClass, "temperature") + config.Units = "℉" + config.Icon = SetDefault(config.Icon, "mdi:thermometer") + + case config.Units == "°C": + fallthrough + case config.Units == "C": + fallthrough + case config.Units == "℃": + config.DeviceClass = SetDefault(config.DeviceClass, "temperature") + config.Units = "°C" + config.Icon = SetDefault(config.Icon, "mdi:thermometer") + + case config.Icon == "mdi:home-battery-outline": + fallthrough + case config.Icon == "mdi:battery": + config.DeviceClass = SetDefault(config.DeviceClass, "battery") + // config.Icon = SetDefault(config.Icon, "mdi:percent") // mdi:home-battery-outline + + case config.Value.TypeValue == "Percent": + fallthrough + case config.Units == "%": + // @TODO - Not supported in older versions of HA. + // config.DeviceClass = SetDefault(config.DeviceClass, "battery") + config.Icon = SetDefault(config.Icon, "mdi:percent") // mdi:home-battery-outline + + case config.Value.TypeValue == "DateTime": + config.DeviceClass = SetDefault(config.DeviceClass, "timestamp") // date + config.Icon = SetDefault(config.Icon, "mdi:clock-outline") + + case config.Units == "h": + // config.DeviceClass = SetDefault(config.DeviceClass, "timestamp") // date + config.Icon = SetDefault(config.Icon, "mdi:clock-outline") + + case config.Units == "kg": + config.DeviceClass = SetDefault(config.DeviceClass, "weight") + config.Icon = SetDefault(config.Icon, "mdi:weight") + + case config.Units == "km": + config.DeviceClass = SetDefault(config.DeviceClass, "distance") + config.Icon = SetDefault(config.Icon, "mdi:map-marker-distance") + + case config.Units == "Wh/㎡": + fallthrough + case config.Units == "W/㎡": + // @TODO - Not supported in older versions of HA. + config.DeviceClass = SetDefault(config.DeviceClass, "irradiance") + config.Icon = SetDefault(config.Icon, "mdi:weather-sunny") + + case config.Value.TypeValue == "Currency": + fallthrough + case config.Units == "AUD": + fallthrough + case config.Units == "$": + config.DeviceClass = SetDefault(config.DeviceClass, "monetary") + config.Icon = SetDefault(config.Icon, "mdi:currency-usd") + + // p13013 - power_factor + + case config.Units == "GPS": + // config.DeviceClass = SetDefault(config.DeviceClass, "") + config.Icon = SetDefault(config.Icon, "mdi:crosshairs-gps") + + default: + config.DeviceClass = SetDefault(config.DeviceClass, "") + config.Icon = SetDefault(config.Icon, "") } switch { - case config.Point.IsBoot(): - config.StateClass = "measurement" - config.LastReset = "" - config.LastResetValueTemplate = "" - - case config.Point.IsDaily(): - fallthrough - case config.Point.IsMonthly(): - fallthrough - case config.Point.IsYearly(): - fallthrough - case config.Point.IsTotal(): - config.StateClass = "total" - config.LastResetValueTemplate = SetDefault(config.LastResetValueTemplate, "{{ value_json.last_reset | as_datetime }}") - // config.LastReset = config.Point.WhenReset(config.Date) - - case config.Point.Is5Minute(): - fallthrough - case config.Point.Is15Minute(): - fallthrough - case config.Point.Is30Minute(): - fallthrough - case config.Point.IsInstant(): - fallthrough - default: - config.StateClass = "measurement" - config.LastReset = "" - config.LastResetValueTemplate = "" + case config.Point.IsBoot(): + config.StateClass = "measurement" + config.LastReset = "" + config.LastResetValueTemplate = "" + + case config.Point.IsDaily(): + fallthrough + case config.Point.IsMonthly(): + fallthrough + case config.Point.IsYearly(): + fallthrough + case config.Point.IsTotal(): + config.StateClass = "total" + config.LastResetValueTemplate = SetDefault(config.LastResetValueTemplate, "{{ value_json.last_reset | as_datetime }}") + // config.LastReset = config.Point.WhenReset(config.Date) + + case config.Point.Is5Minute(): + fallthrough + case config.Point.Is15Minute(): + fallthrough + case config.Point.Is30Minute(): + fallthrough + case config.Point.IsInstant(): + fallthrough + default: + config.StateClass = "measurement" + config.LastReset = "" + config.LastResetValueTemplate = "" } // if config.LastReset == "" { diff --git a/tablib/tablib_tabular.go b/tablib/tablib_tabular.go index 07b6d8b64..4e5dff0fe 100644 --- a/tablib/tablib_tabular.go +++ b/tablib/tablib_tabular.go @@ -1,10 +1,11 @@ package tablib import ( - "GoSungrow/tablib/gotabulate" "regexp" "strings" "unicode/utf8" + + "github.com/MickMake/GoSungrow/tablib/gotabulate" ) var ( @@ -21,7 +22,7 @@ var ( // as ASCII table with Markdown format TabularMarkdown = "markdown" - TabularUtf8 = "utf8" + TabularUtf8 = "utf8" TabularMickMake = "mickmake" )