diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 807317173..0b5bd3740 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,1010 +5,64 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="76adadc9-ae71-42a6-82a1-66dbc8ecb14c" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/cmd/cmd_show.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/iSolarCloud/highlevel_device.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/iSolarCloud/highlevel_point.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/iSolarCloud/highlevel_ps.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/iSolarCloud/highlevel_template.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/cmd_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/cmd_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/cmd_data.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/cmd_data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmd/cmd_info.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/cmd_info.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/cmd_mqtt.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/cmd_mqtt.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/commands.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/commands.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/acceptPsSharing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/acceptPsSharing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/activateEmail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/activateEmail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceRepair/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceRepair/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addFault/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addFault/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultPlan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultPlan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultRepairSteps/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addFaultRepairSteps/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdEvaluation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdEvaluation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdWorkOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addHouseholdWorkOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addOnDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addOnDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addOperRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addOperRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addOrDelPsStructure/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addOrDelPsStructure/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addOrderStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addOrderStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addPowerStationForHousehold/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addPowerStationForHousehold/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addPowerStationInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addPowerStationInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addReportConfigEmail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addReportConfigEmail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addSysAdvancedParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addSysAdvancedParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/addSysOrgNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/addSysOrgNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/aliPayAppTest/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/aliPayAppTest/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/auditOperRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/auditOperRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchAddStationBySn/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchAddStationBySn/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchImportSN/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchImportSN/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchInsertUserAndOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchInsertUserAndOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchProcessPlantReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchProcessPlantReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchUpdateDeviceSim/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchUpdateDeviceSim/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/boundMobilePhone/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/boundMobilePhone/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/boundUserMail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/boundUserMail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/calculateDeviceDiscrete/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/calculateDeviceDiscrete/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/calculateInitialCompensationData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/calculateInitialCompensationData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cancelDeliverMail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cancelDeliverMail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cancelOrderScan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cancelOrderScan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cancelParamSetTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cancelParamSetTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cancelPsSharing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cancelPsSharing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cancelRechargeOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cancelRechargeOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/changRechargeOrderToCancel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/changRechargeOrderToCancel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/changeRemoteParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/changeRemoteParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkDealerOrgCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkDealerOrgCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkInverterResult/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkInverterResult/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkIsCanDoParamSet/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkIsCanDoParamSet/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkIsIvScan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkIsIvScan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkOssObjectExist/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkOssObjectExist/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkServiceIsConnect/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkServiceIsConnect/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkTechnicalParameters/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkTechnicalParameters/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUnitStatus/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUnitStatus/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserAccountUnique/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserAccountUnique/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserInfoUnique/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserInfoUnique/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserIsExist/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserIsExist/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserListIsExist/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserListIsExist/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserPassword/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/checkUserPassword/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/cloudDeploymentRecord/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/cloudDeploymentRecord/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/comfirmParamModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/comfirmParamModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/communicationModuleDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/communicationModuleDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/compareValidateCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/compareValidateCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/componentInfo2Cloud/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/componentInfo2Cloud/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/confirmFault/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/confirmFault/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/confirmIvFault/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/confirmIvFault/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/confirmReportConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/confirmReportConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/createAppkeyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/createAppkeyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/createRenewInvoice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/createRenewInvoice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealCommandReply/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealCommandReply/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealFaultOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealFaultOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealPsDataSupplement/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealPsDataSupplement/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealPsReportEmailSend/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealPsReportEmailSend/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealRemoteUpgrade/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealRemoteUpgrade/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealSnElectrifyCheck/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealSnElectrifyCheck/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/delDeviceRepair/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/delDeviceRepair/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/delOperRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/delOperRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/delayCallApiResidueTimes/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/delayCallApiResidueTimes/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteComponent/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteComponent/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteCustomerEmployee/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteCustomerEmployee/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteDeviceAccount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteDeviceAccount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteDeviceSimById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteDeviceSimById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteElectricitySettlementData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteElectricitySettlementData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteFaultPlan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteFaultPlan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteFirmwareFiles/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteFirmwareFiles/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteModuleLog/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteModuleLog/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOnDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOnDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOperateBillFile/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOperateBillFile/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOssObject/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteOssObject/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerDevicePointById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerDevicePointById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerPicture/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerPicture/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteProductionData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteProductionData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deletePs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deletePs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteRechargeOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteRechargeOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteSysAdvancedParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteSysAdvancedParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteSysOrgNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteSysOrgNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/devicePointsDataFromMySql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/devicePointsDataFromMySql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/deviceReplace/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/deviceReplace/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/editDeviceRepair/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/editDeviceRepair/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/editOperRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/editOperRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/energyPovertyAlleviation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/energyPovertyAlleviation/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/energyTrend/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/energyTrend/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/exportParamSettingValPDF/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/exportParamSettingValPDF/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/exportPlantReportPDF/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/exportPlantReportPDF/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/faultAutoClose/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/faultAutoClose/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findCodeValueList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findCodeValueList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findEmgOrgInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findEmgOrgInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findEnvironmentInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findEnvironmentInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findFromHbaseAndRedis/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findFromHbaseAndRedis/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findInfoByuuid/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findInfoByuuid/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findLossAnalysisList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findLossAnalysisList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findOnDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findOnDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findPsType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findPsType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findSingleStationPR/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findSingleStationPR/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/findUserPassword/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/findUserPassword/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/generateRandomPassword/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/generateRandomPassword/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAPIServiceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAPIServiceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAccessedPermission/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAccessedPermission/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAllDeviceByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllDeviceByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPsIdByOrgIds/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAllUserRemindCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllUserRemindCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAndOutletsAndUnit/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAndOutletsAndUnit/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getApiCallsForAppkeys/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getApiCallsForAppkeys/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAreaList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAreaList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getAutoCreatePowerStation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAutoCreatePowerStation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getBackReadValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getBackReadValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getBatchNewestPointData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getBatchNewestPointData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCallApiResidueTimes/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCallApiResidueTimes/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getChangedPsListByTime/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getChangedPsListByTime/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getChnnlListByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getChnnlListByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCloudList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCloudList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getComponentModelFactory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getComponentModelFactory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getConfigList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getConfigList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCountDown/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCountDown/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCountryServiceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCountryServiceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCounty/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCounty/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCustomerEmployee/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCustomerEmployee/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getCustomerList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCustomerList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDataFromHBase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDataFromHBase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevRecord/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevRecord/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevRunRecordList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevRunRecordList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevSimByList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevSimByList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevSimList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevSimList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceAccountById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceAccountById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceInfo/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceModelInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceModelInfoList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePoints/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePoints/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePropertys/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDevicePropertys/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceRepairDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceRepairDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTechBranchCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTechBranchCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTypeInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTypeInfoList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getDstInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getDstInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getElectricitySettlementData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getElectricitySettlementData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getEncryptPublicKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getEncryptPublicKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultPlanList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultPlanList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFileOperationRecordOne/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFileOperationRecordOne/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getGroupStringCheckResult/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getGroupStringCheckResult/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getGroupStringCheckRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getGroupStringCheckRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHisData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHisData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHistoryInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHistoryInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdEvaluation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdEvaluation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdUserInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdUserInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nConfigByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nConfigByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nFileInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nFileInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nInfoByKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nInfoByKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nVersion/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getI18nVersion/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getIncomeSettingInfos/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getIncomeSettingInfos/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInfoFromAMap/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInfoFromAMap/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInfomationFromRedis/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInfomationFromRedis/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInstallInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInstallInfoList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInvertDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInvertDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterDataCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterDataCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterProcess/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterProcess/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterUuidBytotalId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInverterUuidBytotalId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getIvEchartsData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getIvEchartsData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getIvEchartsDataById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getIvEchartsDataById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getKpiInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getKpiInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getListMiFromHBase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getListMiFromHBase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getMapInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getMapInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getMapMiFromHBase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getMapMiFromHBase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getMenuAndPrivileges/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getMenuAndPrivileges/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getModuleLogInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getModuleLogInfo/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getModuleLogTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getModuleLogTaskList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getNationProvJSON/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getNationProvJSON/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getNoticeInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getNoticeInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getNumberOfServiceCalls/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getNumberOfServiceCalls/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOSSConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOSSConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOperRuleDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOperRuleDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOperateBillFileId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOperateBillFileId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOperateTicketForDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOperateTicketForDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDataSql2/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDataSql2/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDatas/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDatas/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderStatistics/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrderStatistics/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgIdNameByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgIdNameByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListByName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListByName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListForUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOrgListForUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOssObjectStream/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOssObjectStream/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getOwnerFaultConfigList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOwnerFaultConfigList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPListinfoFromMysql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPListinfoFromMysql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getParamterSettingBase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getParamterSettingBase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPhotoInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPhotoInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPlanedOrNotPsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPlanedOrNotPsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPlantReportPDFList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPlantReportPDFList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceModelTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceModelTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointNames/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointNames/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerPictureList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerPictureList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerSettingCharges/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerSettingCharges/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationBasicInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationBasicInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationData/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationForHousehold/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationForHousehold/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationPR/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationPR/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationTableDataSql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationTableDataSql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStatistics/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerStatistics/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerTrendDayData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPowerTrendDayData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getProvInfoListByNationCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getProvInfoListByNationCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsAuthKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsAuthKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsCurveInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsCurveInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailByUserTokens/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailByUserTokens/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailForSinglePage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailForSinglePage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsHealthState/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsHealthState/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsInstallerByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsInstallerByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsList/funcs.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsList/funcs.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListByName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListByName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListStaticData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsListStaticData/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsReport/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsUser/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getPsWeatherList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsWeatherList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRechargeOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRegionalTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRegionalTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteParamSettingList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteParamSettingList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getReportData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getReportData/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getReportEmailConfigInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getReportEmailConfigInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getReportExportColumns/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getReportExportColumns/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getReportListByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getReportListByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRobotDynamicCleaningView/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getRuleUnit/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRuleUnit/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSendReportConfigCron/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSendReportConfigCron/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSerialNum/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSerialNum/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getShieldMapConditionList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getShieldMapConditionList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSimIdBySnList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSimIdBySnList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSingleIVData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSingleIVData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSnChangeRecord/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSnChangeRecord/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSnConnectionInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSnConnectionInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getStationInfoSql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getStationInfoSql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSungwsConfigCache/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSungwsConfigCache/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSweepRobotDevList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSweepRobotDevList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSysMsg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSysMsg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSysOrgNewList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSysOrgNewList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSysOrgNewOne/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSysOrgNewOne/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getSysUserById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSysUserById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getTableDataSql/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getTableDataSql/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getTableDataSqlCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getTableDataSqlCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getTemplateByInfoType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getTemplateByInfoType/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getTemplateList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getTemplateList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUUIDByUpuuid/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUUIDByUpuuid/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUpTimePoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUpTimePoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserByInstaller/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserByInstaller/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserGDPRAttrs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserGDPRAttrs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserHavePowerStationCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserHavePowerStationCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getUserPsOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserPsOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getValFromHBase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getValFromHBase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getValidateCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getValidateCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getValidateCodeAtRegister/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getValidateCodeAtRegister/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getWeatherInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getWeatherInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getWechatPushConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getWechatPushConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/getWorkInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getWorkInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/groupStringCheck/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/groupStringCheck/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/handleDevByCommunicationSN/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/handleDevByCommunicationSN/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/householdResetPassBySN/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/householdResetPassBySN/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/immediatePayment/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/immediatePayment/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/importExcelData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/importExcelData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/incomeStatistics/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/incomeStatistics/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/informPush/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/informPush/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/insertEmgOrgInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/insertEmgOrgInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/intoDataToHbase/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/intoDataToHbase/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/ipLocationQuery/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/ipLocationQuery/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/isHave2GSn/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/isHave2GSn/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/judgeIsSettingMan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/judgeIsSettingMan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/listOssFiles/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/listOssFiles/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/loadAreaInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/loadAreaInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/loadPowerStation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/loadPowerStation/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/login/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/login/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/loginByToken/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/loginByToken/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/logout/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/logout/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/mobilePhoneHasBound/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/mobilePhoneHasBound/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifiedDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifiedDeviceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyEmgOrgStruc/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyEmgOrgStruc/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyFaultPlan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyFaultPlan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyOnDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyOnDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPassword/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPassword/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPersonalUnitList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPersonalUnitList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPsUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/modifyPsUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/moduleLogParamSet/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/moduleLogParamSet/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/operateOssFile/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/operateOssFile/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/orgPowerReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/orgPowerReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/paramSetTryAgain/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/paramSetTryAgain/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/paramSetting/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/paramSetting/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/planPower/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/planPower/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/powerDevicePointList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/powerDevicePointList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/powerTrendChartData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/powerTrendChartData/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/psForcastInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/psForcastInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/psHourPointsValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/psHourPointsValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryAllPsIdAndName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryAllPsIdAndName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCardStatusCTCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCardStatusCTCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryChildAccountList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryChildAccountList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCompensationRecordData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCompensationRecordData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCompensationRecordList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCompensationRecordList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryComponent/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryComponent/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryComponentTechnicalParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryComponentTechnicalParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCountryGridAndRelation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCountryGridAndRelation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCountryList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCountryList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryCtrlTaskById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryCtrlTaskById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceInfoForApp/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceInfoForApp/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceListByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceListByUserId/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceListForApp/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceListForApp/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceModelTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceModelTechnical/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRepairList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceRepairList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryEnvironmentList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryEnvironmentList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultPlanDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultPlanDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultRepairSteps/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultRepairSteps/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeByDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeByDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryFirmwareFilesPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryFirmwareFilesPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryInfotoAlert/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryInfotoAlert/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryInverterModelList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryInverterModelList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryInverterVersionList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryInverterVersionList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryModelInfoByModelId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryModelInfoByModelId/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryMutiPointDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryMutiPointDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryNoticeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryNoticeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOperRules/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOperRules/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrderStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrderStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgGenerationReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgGenerationReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgInfoList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryParamSettingTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryParamSettingTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPersonalUnitList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPersonalUnitList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPointDataTopOne/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPointDataTopOne/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPowerStationInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPowerStationInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsCompensationRecordList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsCompensationRecordList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsDataByDate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsDataByDate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsIdList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsIdList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsNameByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsNameByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsPrByDate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsPrByDate/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsProfit/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsProfit/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsStructureList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsStructureList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryRepairRuleList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryRepairRuleList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryReportListForManagementPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryReportListForManagementPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryReportMsg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryReportMsg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/querySharingPs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/querySharingPs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/querySysAdvancedParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/querySysAdvancedParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryTimeBySN/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryTimeBySN/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryTrafficCTCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryTrafficCTCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUnitList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUnitList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserBtnPri/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserBtnPri/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserByUserIds/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserByUserIds/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserExtensionAttribute/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserExtensionAttribute/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserForStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserForStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserProcessPri/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserProcessPri/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserWechatBindRel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserWechatBindRel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/rechargeOrderSetMeal/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/rechargeOrderSetMeal/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/reportList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/reportList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveCustomerEmployee/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveCustomerEmployee/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveDevSimList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveDevSimList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveEnvironmentCurve/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveEnvironmentCurve/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveFirmwareFile/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveFirmwareFile/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveIncomeSettingInfos/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveIncomeSettingInfos/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveParamModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveParamModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerCharges/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerCharges/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerDevicePoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerDevicePoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerRobotInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerRobotInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerSettingCharges/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerSettingCharges/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerSettingInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/savePowerSettingInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveProductionBatchData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveProductionBatchData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveRechargeOrderObj/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveRechargeOrderObj/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveRepair/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveRepair/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveReportExportColumns/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveReportExportColumns/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveSetParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveSetParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveSysUserMsg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveSysUserMsg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/saveTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/saveTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/selectSysTranslationNames/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/selectSysTranslationNames/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/setUserGDPRAttrs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/setUserGDPRAttrs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/settingNotice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/settingNotice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/shareMyPs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/shareMyPs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sharePsBySN/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sharePsBySN/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/showInverterByUnit/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/showInverterByUnit/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/showOnlineUsers/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/showOnlineUsers/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/showWarning/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/showWarning/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/snIsExist/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/snIsExist/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/snsIsExist/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/snsIsExist/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/speedyAddPowerStation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/speedyAddPowerStation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationUnitsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationUnitsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationsDiscreteData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationsDiscreteData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationsIncomeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationsIncomeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationsPointReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationsPointReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/stationsYearPlanReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/stationsYearPlanReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sureAndImportSelettlementData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sureAndImportSelettlementData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevParamSet/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevParamSet/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevRunControl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevRunControl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevStrategyIssue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sweepDevStrategyIssue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/sysTimeZoneList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/sysTimeZoneList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/unLockUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/unLockUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/unlockChildAccount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/unlockChildAccount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateCommunicationModuleState/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateCommunicationModuleState/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateDevInstalledPower/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateDevInstalledPower/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateFault/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateFault/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultStatus/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateFaultStatus/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateOwnerFaultConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateOwnerFaultConfig/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateParamSettingSysMsg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateParamSettingSysMsg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerDevicePoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerDevicePoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerRobotInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerRobotInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerStationForHousehold/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerStationForHousehold/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerStationInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerStationInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerUserInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updatePowerUserInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateShareAttr/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateShareAttr/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateSnIsSureFlag/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateSnIsSureFlag/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateStationPics/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateStationPics/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateSysAdvancedParam/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateSysAdvancedParam/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateSysOrgNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateSysOrgNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserExtensionAttribute/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserExtensionAttribute/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserLanguage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserLanguage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserPosition/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserPosition/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserUpOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/updateUserUpOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/upgrade/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/upgrade/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/upgrate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/upgrate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/uploadFileToOss/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/uploadFileToOss/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/userAgreeGdprProtocol/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/userAgreeGdprProtocol/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/userInfoUniqueCheck/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/userInfoUniqueCheck/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/userMailHasBound/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/userMailHasBound/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/userRegister/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/userRegister/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/Common/images.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/Common/images.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/addBuildProgressing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/addBuildProgressing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/findSingleStationPR/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/findSingleStationPR/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getMapByUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getMapByUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsListByMapId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsListByMapId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/orgPowerReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/orgPowerReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/NullArea/NullEndpoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/NullArea/NullEndpoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/addMaterial/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/addMaterial/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/addOptTicketInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/addOptTicketInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/addSpareParts/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/addSpareParts/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/associateQueryFaultNames/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/associateQueryFaultNames/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/calcOutputRankByDay/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/calcOutputRankByDay/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/changeReadStatus/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/changeReadStatus/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/checkMaterialName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/checkMaterialName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/confirmFault/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/confirmFault/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/copeOperateTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/copeOperateTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/copySecondTypeTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/copySecondTypeTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/copyWorkTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/copyWorkTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/delOptTicketInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/delOptTicketInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteDuty/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteDuty/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteDutyMid/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteDutyMid/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteMaterial/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteMaterial/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteSparePartsById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteSparePartsById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteWorkTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deleteWorkTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/deviceFactoryList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/deviceFactoryList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/dispartDataPageList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/dispartDataPageList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/executeTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/executeTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findCurrentTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findCurrentTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findFactoryMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findFactoryMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findImgResources/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findImgResources/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMateiralSubType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMateiralSubType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMaterialById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMaterialById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMyDealedImgResources/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findMyDealedImgResources/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findSeriesInverterData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findSeriesInverterData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/findWebRole/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/findWebRole/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsFaultCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsFaultCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllPsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllStore/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getAllStore/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getBoxData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getBoxData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCBoxTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCBoxTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCheckDevTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCheckDevTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCheckUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCheckUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getChildOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getChildOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCodeTreeMap/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getCodeTreeMap/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDST/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDST/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDataCounts/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDataCounts/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDataInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDataInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceDataList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceFactory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceFactory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevicePointAttrs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDevicePointAttrs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceTreeChild/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceTreeChild/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceUuid/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDeviceUuid/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDutyInfoById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDutyInfoById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDutyOrgZtree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getDutyOrgZtree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getElecEffectList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getElecEffectList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getEnvironmentInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getEnvironmentInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultName/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrder/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrder/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderStepList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getFaultOrderStepList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getHTRoleList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getHTRoleList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getHistoryComments/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getHistoryComments/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverteTableListCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverteTableListCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterDiscreteList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterDiscreteList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterFactoryList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterFactoryList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getInverterInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getLoadCurveList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getLoadCurveList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getMultiPowers/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getMultiPowers/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOndutyQuery/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOndutyQuery/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOperateTicketUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOperateTicketUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderDataSize/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrderDataSize/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getParentUidChain/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getParentUidChain/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerPrList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerPrList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendDayData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendDayData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendYearData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerTrendYearData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPowerValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlock/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlock/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlockData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlockData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlockTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBlockTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBoxListCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsBoxListCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsCBoxDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsCBoxDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsContact/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsContact/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDataVal/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDataVal/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsFaultList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsFaultList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsIdByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsIdByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsIdState/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsIdState/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsPictureMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsPictureMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTreeChild/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsTreeChild/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsUserList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPsValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPscSeriseData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getPscSeriseData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportInfoByReportId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportInfoByReportId/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportListByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportListByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportPsTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getReportPsTree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getRoleList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getRoleList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSafeEffectList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSafeEffectList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSelfReportPoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSelfReportPoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSparePartsDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSparePartsDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getStatementList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getStatementList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getStoreByStationId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getStoreByStationId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSysUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getSysUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getTableList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getTableList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWeather/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWeather/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getWorkTicketUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getinverterType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getinverterType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/getreportPermissionByUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/getreportPermissionByUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/handleValue/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/handleValue/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/modifyDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/modifyDeviceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/operaStoreSpareParts/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/operaStoreSpareParts/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/operateBillTransferToUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/operateBillTransferToUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryAllStockInventory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryAllStockInventory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryBatteryBoardsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryCodeByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryCodeByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryDeviceInfoList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryDeviceInfoList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultCodes/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultCodes/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultNames/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryFaultNames/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryMaterialType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryMaterialType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryNounAndKlgList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryNounAndKlgList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryNounList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryNounList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryOptTickctInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryOptTickctInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryOrgIdByUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryOrgIdByUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsCountryList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsCountryList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsProvcnList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsProvcnList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/querySparePartsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/querySparePartsList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryStoreList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryStoreList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/querySysTimezone/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/querySysTimezone/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/renewOperation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/renewOperation/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveCustomReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveCustomReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveInventory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveInventory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveMaterial/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveMaterial/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveSelfReportPoint/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveSelfReportPoint/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveWorkTicket/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/saveWorkTicket/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/selectPowerPageList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/selectPowerPageList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showFxReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showFxReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showMaterNameList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showMaterNameList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showMaterSubTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showMaterSubTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showPSView/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showPSView/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/showTjReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showTjReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/templateLikesInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/templateLikesInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updOptTicketInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updOptTicketInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateBillTicketForTask/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateBillTicketForTask/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateDutyInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateDutyInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateMaterial/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateMaterial/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateSpareParts/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateSpareParts/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateStopReason/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateStopReason/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateTemplate/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/updateTemplate/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchDelDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchDelDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/delDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/delDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePicture/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePicture/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePointInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePointInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerStore/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deletePowerStore/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteUserNode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deleteUserNode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deployProcess/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/deployProcess/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAuthKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAuthKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getCodeByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getCodeByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getContactMessage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getContactMessage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getCountryNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getCountryNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeploymentList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeploymentList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDevicePro/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDevicePro/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceType/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDutyUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getDutyUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialByType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialByType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaterialList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getModelPoints/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getModelPoints/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getNamecnNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getNamecnNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getNationList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getNationList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOperationRecord/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOperationRecord/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgForPs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgForPs/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgStationList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgStationList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgUserList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtree/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPictureList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPictureList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPointInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPointInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStation/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStation/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStationList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStationList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStore/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPowerStore/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getProvcnNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getProvcnNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getStateNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getStateNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSysUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getTownValueNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getTownValueNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getVillageList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getVillageList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getVillageListNew/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getVillageListNew/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isCanAddUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isCanAddUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isHasPlan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/isHasPlan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/loadDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/loadDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modelPointsPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modelPointsPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifyDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifyDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySysOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySysOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemRole/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemRole/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/modifySystemUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/publishNotice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/publishNotice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryDeviceListForBackSys/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryDutyType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryDutyType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryReportDataById/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/queryReportDataById/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/resetPasW/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/resetPasW/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveAuthKey/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveAuthKey/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDeviceType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveDeviceType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveModelPoints/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveModelPoints/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveNewNotice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveNewNotice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrgNode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrgNode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePicture/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePicture/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePointManage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePointManage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerPlan/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerPlan/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerStore/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePowerStore/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePsOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/savePsOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveRelDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveRelDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysMenu/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysMenu/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysOrg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysOrg/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysRole/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysRole/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveSysUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveUserNode/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveUserNode/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveUserRole/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/saveUserRole/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/startWorkFlow/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/startWorkFlow/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateDevice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateDevice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateDeviceType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateDeviceType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateNotice/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateNotice/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePointInfo/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePointInfo/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateProcessManage/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateProcessManage/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateValidFlag/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/updateValidFlag/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/legacy.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/legacy.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_json.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_json.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/datetime.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/datetime.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/point.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/point.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/help.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/help.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/legacy.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/legacy.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/struct_data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/struct_data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/data_request.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/data_request.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/highlevel.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/highlevel.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/struct.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/struct.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1082,7 +136,7 @@
     <configuration name="GoSungrow" type="GoApplicationRunConfiguration" factoryName="Go Application">
       <module name="GoSungrow" />
       <working_directory value="$PROJECT_DIR$" />
-      <parameters value="show template data 8042 20221001 20221002 5" />
+      <parameters value="data table AppService.queryMutiPointDataList MinuteInterval:5 StartTimeStamp:20221001000000 EndTimeStamp:20221001235900 Points:1129147_14_1_1.p13144" />
       <envs>
         <env name="GOCACHE" value="/Volumes/Media/GoCache" />
       </envs>
@@ -1136,21 +190,6 @@
           <line>186</line>
           <option name="timeStamp" value="202" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
-          <line>265</line>
-          <option name="timeStamp" value="311" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
-          <line>660</line>
-          <option name="timeStamp" value="336" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
-          <line>489</line>
-          <option name="timeStamp" value="337" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/cmd/cmd_mqtt.go</url>
           <line>326</line>
@@ -1203,7 +242,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>66</line>
+          <line>67</line>
           <option name="timeStamp" value="3787" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
@@ -1216,11 +255,6 @@
           <line>128</line>
           <option name="timeStamp" value="4110" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/AppService/queryMutiPointDataList/data.go</url>
-          <line>263</line>
-          <option name="timeStamp" value="4111" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointNames/data.go</url>
           <line>108</line>
@@ -1233,27 +267,27 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
-          <line>600</line>
+          <line>602</line>
           <option name="timeStamp" value="4194" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
-          <line>611</line>
+          <line>613</line>
           <option name="timeStamp" value="4195" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
-          <line>621</line>
+          <line>623</line>
           <option name="timeStamp" value="4196" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
-          <line>631</line>
+          <line>633</line>
           <option name="timeStamp" value="4197" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
-          <line>666</line>
+          <line>668</line>
           <option name="timeStamp" value="4201" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
@@ -1336,21 +370,11 @@
           <line>78</line>
           <option name="timeStamp" value="6495" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>502</line>
-          <option name="timeStamp" value="6513" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/reflection/funcs.go</url>
           <line>156</line>
           <option name="timeStamp" value="6686" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go</url>
-          <line>738</line>
-          <option name="timeStamp" value="6720" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go</url>
           <line>91</line>
@@ -1358,59 +382,49 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>780</line>
+          <line>818</line>
           <option name="timeStamp" value="6784" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>836</line>
+          <line>874</line>
           <option name="timeStamp" value="6789" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>813</line>
+          <line>851</line>
           <option name="timeStamp" value="6790" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>768</line>
+          <line>806</line>
           <option name="timeStamp" value="6792" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>723</line>
+          <line>761</line>
           <option name="timeStamp" value="6794" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>683</line>
+          <line>721</line>
           <option name="timeStamp" value="6796" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>679</line>
+          <line>717</line>
           <option name="timeStamp" value="6797" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>596</line>
+          <line>634</line>
           <option name="timeStamp" value="6800" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/uv.go</url>
-          <line>1072</line>
+          <line>1110</line>
           <option name="timeStamp" value="6822" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go</url>
-          <line>1162</line>
-          <option name="timeStamp" value="6934" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>494</line>
-          <option name="timeStamp" value="6977" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/gojson/struct.go</url>
           <line>226</line>
@@ -1431,14 +445,9 @@
           <line>251</line>
           <option name="timeStamp" value="6987" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go</url>
-          <line>735</line>
-          <option name="timeStamp" value="7070" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
-          <line>714</line>
+          <line>662</line>
           <option name="timeStamp" value="7135" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
@@ -1461,21 +470,6 @@
           <line>200</line>
           <option name="timeStamp" value="7194" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>371</line>
-          <option name="timeStamp" value="7245" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>372</line>
-          <option name="timeStamp" value="7246" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
-          <line>261</line>
-          <option name="timeStamp" value="7250" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceInfoForApp/data.go</url>
           <line>141</line>
@@ -1508,7 +502,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
-          <line>468</line>
+          <line>160</line>
           <option name="timeStamp" value="7276" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
@@ -1571,11 +565,6 @@
           <line>18</line>
           <option name="timeStamp" value="7396" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
-          <line>302</line>
-          <option name="timeStamp" value="7405" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/AppService/getDeviceList/data.go</url>
           <line>166</line>
@@ -1641,6 +630,171 @@
           <line>147</line>
           <option name="timeStamp" value="7510" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data_request.go</url>
+          <line>817</line>
+          <option name="timeStamp" value="7600" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>433</line>
+          <option name="timeStamp" value="7619" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>569</line>
+          <option name="timeStamp" value="7622" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>152</line>
+          <option name="timeStamp" value="7644" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>977</line>
+          <option name="timeStamp" value="7659" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>549</line>
+          <option name="timeStamp" value="7661" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>550</line>
+          <option name="timeStamp" value="7662" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>554</line>
+          <option name="timeStamp" value="7663" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>555</line>
+          <option name="timeStamp" value="7664" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>916</line>
+          <option name="timeStamp" value="7666" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>178</line>
+          <option name="timeStamp" value="7684" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>171</line>
+          <option name="timeStamp" value="7685" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>834</line>
+          <option name="timeStamp" value="7686" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>833</line>
+          <option name="timeStamp" value="7688" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>239</line>
+          <option name="timeStamp" value="7689" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>438</line>
+          <option name="timeStamp" value="7690" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>619</line>
+          <option name="timeStamp" value="7691" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>490</line>
+          <option name="timeStamp" value="7701" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>462</line>
+          <option name="timeStamp" value="7702" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>573</line>
+          <option name="timeStamp" value="7703" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>523</line>
+          <option name="timeStamp" value="7706" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>540</line>
+          <option name="timeStamp" value="7708" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>547</line>
+          <option name="timeStamp" value="7709" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>553</line>
+          <option name="timeStamp" value="7710" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_graph.go</url>
+          <line>556</line>
+          <option name="timeStamp" value="7711" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
+          <line>432</line>
+          <option name="timeStamp" value="7713" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>465</line>
+          <option name="timeStamp" value="7714" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/data.go</url>
+          <line>444</line>
+          <option name="timeStamp" value="7715" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go</url>
+          <line>314</line>
+          <option name="timeStamp" value="7718" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
+          <line>477</line>
+          <option name="timeStamp" value="7727" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
+          <line>375</line>
+          <option name="timeStamp" value="7728" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go</url>
+          <line>377</line>
+          <option name="timeStamp" value="7729" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_table.go</url>
+          <line>485</line>
+          <option name="timeStamp" value="7730" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="DlvErrorBreakpoint" />
diff --git a/cmd/cmd_info.go b/cmd/cmd_info.go
index 9081fd02c..ffc2ec73c 100644
--- a/cmd/cmd_info.go
+++ b/cmd/cmd_info.go
@@ -128,21 +128,21 @@ func (c *CmdInfo) AttachCommand(cmd *cobra.Command) *cobra.Command {
 		cmdInfoCsv.Example = cmdHelp.PrintExamples(cmdInfoCsv, "[area.]<endpoint>")
 		c.AttachCmdInfo(cmdInfoCsv)
 
-		// ********************************************************************************
-		var cmdInfoPut = &cobra.Command{
-			Use:                   "put",
-			Aliases:               []string{"set", "write"},
-			Annotations:           map[string]string{"group": "Info"},
-			Short:                 fmt.Sprintf("Set info on iSolarCloud"),
-			Long:                  fmt.Sprintf("Set info on iSolarCloud"),
-			DisableFlagParsing:    false,
-			DisableFlagsInUseLine: false,
-			PreRunE:               cmds.SunGrowArgs,
-			Run:                   cmds.CmdInfoPut,
-			Args:                  cobra.ExactArgs(2),
-		}
-		c.SelfCmd.AddCommand(cmdInfoPut)
-		cmdInfoPut.Example = cmdHelp.PrintExamples(cmdInfoPut, "[area.]<endpoint> <value>")
+		// // ********************************************************************************
+		// var cmdInfoPut = &cobra.Command{
+		// 	Use:                   "put",
+		// 	Aliases:               []string{"set", "write"},
+		// 	Annotations:           map[string]string{"group": "Info"},
+		// 	Short:                 fmt.Sprintf("Set info on iSolarCloud"),
+		// 	Long:                  fmt.Sprintf("Set info on iSolarCloud"),
+		// 	DisableFlagParsing:    false,
+		// 	DisableFlagsInUseLine: false,
+		// 	PreRunE:               cmds.SunGrowArgs,
+		// 	Run:                   cmds.CmdInfoPut,
+		// 	Args:                  cobra.ExactArgs(2),
+		// }
+		// c.SelfCmd.AddCommand(cmdInfoPut)
+		// cmdInfoPut.Example = cmdHelp.PrintExamples(cmdInfoPut, "[area.]<endpoint> <value>")
 	}
 	return c.SelfCmd
 }
@@ -172,14 +172,14 @@ func (c *CmdInfo) AttachCmdInfo(cmd *cobra.Command) *cobra.Command {
 	return cmd
 }
 
-func (ca *Cmds) CmdInfoPut(_ *cobra.Command, _ []string) {
-	for range Only.Once {
-		fmt.Println("Not yet implemented.")
-		// ca.Api.SunGrow.OutputType.SetFile()
-		// args = cmdConfig.FillArray(2, args)
-		// c.Error = SunGrow.PutHighLevel(args[0], args[1])
-	}
-}
+// func (ca *Cmds) CmdInfoPut(_ *cobra.Command, _ []string) {
+// 	for range Only.Once {
+// 		fmt.Println("Not yet implemented.")
+// 		// ca.Api.SunGrow.OutputType.SetFile()
+// 		// args = cmdConfig.FillArray(2, args)
+// 		// c.Error = SunGrow.PutHighLevel(args[0], args[1])
+// 	}
+// }
 
 
 func (c *CmdInfo) AttachCmdInfoMqtt(cmd *cobra.Command) *cobra.Command {
diff --git a/iSolarCloud/AppService/devicePointsDataFromMySql/data.go b/iSolarCloud/AppService/devicePointsDataFromMySql/data.go
index 7518ed0d4..4915e26ab 100644
--- a/iSolarCloud/AppService/devicePointsDataFromMySql/data.go
+++ b/iSolarCloud/AppService/devicePointsDataFromMySql/data.go
@@ -31,7 +31,7 @@ type ResultData struct {
 		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:"2006/01/02 15:04:05"`
+		DevUpdateTime           valueTypes.DateTime `json:"dev_update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		FaultCount              valueTypes.Count       `json:"fault_count"`
 		InstallerAlarmCount     valueTypes.Count       `json:"installer_alarm_count"`
 		InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"`
@@ -61,7 +61,7 @@ type ResultData struct {
 		P81202                  interface{} `json:"p81202"`
 		P81203                  interface{} `json:"p81203"`
 		PsKey                   valueTypes.PsKey `json:"ps_key"`
-		UpdateTime              valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UpdateTime              valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		UpdateUser              valueTypes.Integer `json:"update_user"`
 		UUID                    valueTypes.Integer `json:"uuid"`
 	} `json:"device_point_data" DataTable:"true"`
diff --git a/iSolarCloud/AppService/energyTrend/data.go b/iSolarCloud/AppService/energyTrend/data.go
index 81efb4864..e133b62cb 100644
--- a/iSolarCloud/AppService/energyTrend/data.go
+++ b/iSolarCloud/AppService/energyTrend/data.go
@@ -26,13 +26,13 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	Echartunit valueTypes.String   `json:"echartunit" PointId:"echart_unit"`
-	EndTime    valueTypes.DateTime `json:"endTime" PointId:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	EndTime    valueTypes.DateTime `json:"endTime" PointId:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	EnergyMap  struct {
 		ValStr valueTypes.String `json:"valStr" PointId:"val_str"`
 	} `json:"energyMap" PointId:"energy_map"`
 	Energyunit valueTypes.String `json:"energyunit" PointId:"energy_unit"`
 	PowerMap   struct {
-		Dates  []valueTypes.DateTime `json:"dates" PointNameDateFormat:"2006/01/02 15:04:05"`
+		Dates  []valueTypes.DateTime `json:"dates" PointNameDateFormat:"2006-01-02 15:04:05"`
 		Units  valueTypes.String     `json:"units"`
 		ValStr valueTypes.String     `json:"valStr" PointId:"val_str"`
 	} `json:"powerMap" PointId:"power_map"`
diff --git a/iSolarCloud/AppService/getChnnlListByPsId/data.go b/iSolarCloud/AppService/getChnnlListByPsId/data.go
index 173c824fa..370341d69 100644
--- a/iSolarCloud/AppService/getChnnlListByPsId/data.go
+++ b/iSolarCloud/AppService/getChnnlListByPsId/data.go
@@ -33,8 +33,8 @@ type ResultData struct {
 		ChannelId      valueTypes.Integer  `json:"chnnl_id" PointId:"channel_id"`
 		ChannelName    valueTypes.String   `json:"chnnl_name" PointId:"channel_name"`
 		ChannelDesc    interface{}         `json:"chnnl_desc" PointId:"channel_description"`
-		CreateTime     valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-		UpdateDate     valueTypes.DateTime `json:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		CreateTime     valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+		UpdateDate     valueTypes.DateTime `json:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		DataFlag       valueTypes.Integer  `json:"data_flag"`
 		DataFlagDetail valueTypes.Integer  `json:"data_flag_detail"`
 		IsAuto         valueTypes.Bool     `json:"is_auto"`
diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go
index 4d86731d8..1ee32f415 100644
--- a/iSolarCloud/AppService/getDeviceList/data.go
+++ b/iSolarCloud/AppService/getDeviceList/data.go
@@ -52,7 +52,7 @@ type Device struct {
 	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:"2006/01/02 15:04:05"`
+	DeviceFactoryDate       valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	DeviceId                valueTypes.Integer  `json:"device_id"`
 	DeviceModel             valueTypes.String   `json:"device_model"`
 	DeviceModelCode         valueTypes.String   `json:"device_model_code"`
diff --git a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
index 25a31610f..f5f742a42 100644
--- a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
+++ b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
@@ -55,7 +55,7 @@ func (e *ResultData) UnmarshalJSON(data []byte) error {
 type DataPoint struct {
 	GoStruct.GoStruct     `json:"-" PointIdReplace:"true" PointIdFrom:"TimeStamp" PointNameDateFormat:"20060102-150405" PointTimestampFrom:"TimeStamp"`
 
-	TimeStamp             valueTypes.DateTime             `json:"time_stamp" PointNameDateFormat:"2006/01/02 15:04:05"`
+	TimeStamp             valueTypes.DateTime             `json:"time_stamp" PointNameDateFormat:"2006-01-02 15:04:05"`
 	Points                map[string]valueTypes.UnitValue `json:"points"`
 	// P13148                valueTypes.Integer          `json:"p13148"`
 	IsPlatformDefaultUnit valueTypes.Bool                `json:"is_platform_default_unit"`
diff --git a/iSolarCloud/AppService/getIncomeSettingInfos/data.go b/iSolarCloud/AppService/getIncomeSettingInfos/data.go
index f8df083d5..a1697970d 100644
--- a/iSolarCloud/AppService/getIncomeSettingInfos/data.go
+++ b/iSolarCloud/AppService/getIncomeSettingInfos/data.go
@@ -35,25 +35,25 @@ type ResultData struct {
 		CountyAllowanceMoney   interface{}         `json:"county_allowance_money"`
 		DefaultCharge          valueTypes.Float    `json:"default_charge"`
 		ElectricChargeId       valueTypes.Integer  `json:"electric_charge_id"`
-		EndTime                valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		EndTime                valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		IncomeStyle            interface{}         `json:"income_style"`
 		IntervalTimeCharge     interface{}         `json:"interval_time_charge"`
 		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"`
-		StartTime              valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		StartTime              valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		UseSharpPeekValleyFlat interface{}         `json:"use_sharp_peek_valley_flat"`
 		ValidFlag              valueTypes.Bool     `json:"valid_flag"`
 	} `json:"powerElectricalChargeMap" PointId:"power_electrical_charge_map"`
 	PowerIntervalTimesChargeMap interface{} `json:"powerIntevalTimesChargeMap" PointId:"power_interval_times_charge_map"`
 	PowerSelfUseTimesChargeMap  struct {
 		DefaultCharge            valueTypes.Float    `json:"default_charge"`
-		EndTime                  valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		EndTime                  valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		IntervalTimeCharge       valueTypes.String   `json:"interval_time_charge"`
 		OnlineElectricityPercent valueTypes.Float    `json:"online_electricity_percent" PointUnit:"%"`
 		PsId                     valueTypes.PsId  `json:"ps_id"`
-		StartTime                valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		StartTime                valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		UseElectricityDiscount   valueTypes.Float    `json:"use_electricity_discount" PointUnit:"%"`
 	} `json:"powerSelfUseTimesChargeMap" PointId:"power_selfuse_times_charge_map"`
 	PsId valueTypes.PsId `json:"ps_id"`
diff --git a/iSolarCloud/AppService/getModuleLogTaskList/data.go b/iSolarCloud/AppService/getModuleLogTaskList/data.go
index 7a0b410d2..74824261b 100644
--- a/iSolarCloud/AppService/getModuleLogTaskList/data.go
+++ b/iSolarCloud/AppService/getModuleLogTaskList/data.go
@@ -32,9 +32,9 @@ type ResultData struct {
 		GoStruct       GoStruct.GoStruct   `json:"-" PointIdReplace:"true" PointIdFrom:"TaskId" PointNameDateFormat:"20060102-150405" PointTimestampFrom:"CreateTime"`
 
 		TaskId         valueTypes.Integer  `json:"task_id"`
-		CreateTime     valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-		OverTime       valueTypes.DateTime `json:"over_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-		UpdateTime     valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		CreateTime     valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+		OverTime       valueTypes.DateTime `json:"over_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+		UpdateTime     valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		ExpireSecond   valueTypes.Integer  `json:"expire_second"`
 		TaskName       valueTypes.String   `json:"task_name"`
 		CommandStatus  valueTypes.Integer  `json:"command_status"`
diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
index 03e0fae1d..6c4a6ee6c 100644
--- a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
+++ b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
@@ -39,9 +39,9 @@ type ResultData struct {
 		OperateUserId        valueTypes.Integer  `json:"operate_user_id"`
 		CommandStatus        valueTypes.Integer  `json:"command_status"`
 		CommandType          valueTypes.Integer  `json:"command_type"`
-		CreateTime           valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-		UpdateTime           valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-		OverTime             valueTypes.DateTime `json:"over_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		CreateTime           valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+		UpdateTime           valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+		OverTime             valueTypes.DateTime `json:"over_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		SetCancelNum         valueTypes.Count    `json:"set_cancel_num"`
 		SetFailNum           valueTypes.Count    `json:"set_fail_num"`
 		SetFinishNum         valueTypes.Count    `json:"set_finish_num"`
diff --git a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
index f545e2630..f664ced15 100644
--- a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
+++ b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
@@ -33,7 +33,7 @@ type ResultData struct {
 	DesignCapacity    valueTypes.Float    `json:"design_capacity"`
 	Email             valueTypes.String   `json:"email"`
 	EnergyScheme      interface{}         `json:"energy_scheme"`
-	ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	FaultSendType     interface{}         `json:"fault_send_type"`
 	GcjLatitude       valueTypes.Float    `json:"gcj_latitude"`
 	GcjLongitude      valueTypes.Float    `json:"gcj_longitude"`
@@ -46,7 +46,7 @@ type ResultData struct {
 	ParamIncome       valueTypes.Float    `json:"param_income"`
 	Prov              interface{}         `json:"prov"`
 	ProvCode          interface{}         `json:"prov_code"`
-	PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsCountryId       valueTypes.Integer  `json:"ps_country_id"`
 	PsDesc            interface{}         `json:"ps_desc"`
 	PsHolder          valueTypes.String   `json:"ps_holder"`
diff --git a/iSolarCloud/AppService/getPowerStationForHousehold/data.go b/iSolarCloud/AppService/getPowerStationForHousehold/data.go
index 469d173fa..117c2b16d 100644
--- a/iSolarCloud/AppService/getPowerStationForHousehold/data.go
+++ b/iSolarCloud/AppService/getPowerStationForHousehold/data.go
@@ -55,14 +55,14 @@ type ResultData struct {
 	DivisionCode          valueTypes.String   `json:"division_code"`
 	Email                 valueTypes.String   `json:"email"`
 	EnergyScheme          interface{}         `json:"energy_scheme"`
-	ExpectInstallDate     valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	ExpectInstallDate     valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	GcjLatitude           valueTypes.Float    `json:"gcj_latitude"`
 	GcjLongitude          valueTypes.Float    `json:"gcj_longitude"`
 	GprsLatitude          valueTypes.Float    `json:"gprs_latitude"`
 	GprsLongitude         valueTypes.Float    `json:"gprs_longitude"`
 	GridLevel             interface{}         `json:"grid_level"`
-	InstallDate           valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-	InstallDateZone       valueTypes.DateTime `json:"install_date_zone" PointNameDateFormat:"2006/01/02 15:04:05"`
+	InstallDate           valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+	InstallDateZone       valueTypes.DateTime `json:"install_date_zone" PointNameDateFormat:"2006-01-02 15:04:05"`
 	InverterCount         valueTypes.Integer  `json:"inverter_count"`
 	InvestmentType        valueTypes.Integer  `json:"investment_type"`
 	InvestmentTypeDesc    valueTypes.String   `json:"investment_type_desc"`
@@ -92,7 +92,7 @@ type ResultData struct {
 	ParamIncomeUnitName   valueTypes.String   `json:"param_income_unit_name"`
 	ProvinceCode          valueTypes.String   `json:"province_code"`
 	ProvinceName          valueTypes.String   `json:"province_name"`
-	PsBuildDate           valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	PsBuildDate           valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsCountryId           valueTypes.Integer  `json:"ps_country_id"`
 	PsCreateUserId        valueTypes.Integer  `json:"ps_create_user_id"`
 	PsCurrentTimeZone     valueTypes.String   `json:"ps_current_time_zone"`
@@ -108,8 +108,8 @@ type ResultData struct {
 	PsTypeDesc            valueTypes.String   `json:"ps_type_desc"`
 	PsTypeName            valueTypes.String   `json:"ps_type_name"`
 	PsUserId              valueTypes.Integer  `json:"ps_user_id"`
-	RecordCreateTime      valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	SafeStartDate         valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	RecordCreateTime      valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	SafeStartDate         valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	SetUserOrg            valueTypes.Integer  `json:"set_user_org"`
 	ShareType             valueTypes.Integer  `json:"share_type"`
 	ShareUserType         interface{}         `json:"share_user_type"`
diff --git a/iSolarCloud/AppService/getPowerStationInfo/data.go b/iSolarCloud/AppService/getPowerStationInfo/data.go
index 7bdab82a7..f4ea50338 100644
--- a/iSolarCloud/AppService/getPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/getPowerStationInfo/data.go
@@ -39,7 +39,7 @@ type ResultData struct {
 		DesignCapacity    valueTypes.Float    `json:"design_capacity" PointUnit:"W"`
 		Email             valueTypes.String   `json:"email"`
 		EnergyScheme      Common.Unknown      `json:"energy_scheme"`
-		ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		FaultSendType     Common.Unknown      `json:"fault_send_type"`
 		GcjLatitude       valueTypes.Float    `json:"gcj_latitude"`
 		GcjLongitude      valueTypes.Float    `json:"gcj_longitude"`
@@ -52,7 +52,7 @@ type ResultData struct {
 		ParamIncome       valueTypes.Float    `json:"param_income"`
 		Prov              Common.Unknown      `json:"prov"`
 		ProvCode          Common.Unknown      `json:"prov_code"`
-		PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		PsCountryId       valueTypes.Integer  `json:"ps_country_id"`
 		PsDesc            Common.Unknown      `json:"ps_desc"`
 		PsHolder          valueTypes.String   `json:"ps_holder"`
@@ -60,7 +60,7 @@ type ResultData struct {
 		PsLocation        valueTypes.String   `json:"ps_location"`
 		PsName            valueTypes.String   `json:"ps_name"`
 		PsType            valueTypes.Integer  `json:"ps_type"`
-		RecordCreateTime  valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		RecordCreateTime  valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		ReportType        Common.Unknown      `json:"report_type"`
 		ShippingAddress   valueTypes.String   `json:"shipping_address"`
 		ShippingZipCode   valueTypes.String   `json:"shipping_zip_code"`
@@ -85,10 +85,10 @@ type ResultData struct {
 		CodeType            valueTypes.Integer  `json:"code_type"`
 		DefaultCharge       valueTypes.Float    `json:"default_charge"`
 		ElectricChargeId    valueTypes.Integer  `json:"electric_charge_id"`
-		EndTime             valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		EndTime             valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		IntervalTimeCharge  Common.Unknown      `json:"interval_time_charge"`
 		ParamIncomeUnitName valueTypes.String   `json:"param_income_unit_name"`
-		StartTime           valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		StartTime           valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	} `json:"powerChargeDataMap" PointId:"power_charge_data_map"`
 
 	SysTimeZones []struct {
diff --git a/iSolarCloud/AppService/getPsDetail/data.go b/iSolarCloud/AppService/getPsDetail/data.go
index 3fee866a0..7accac1d2 100644
--- a/iSolarCloud/AppService/getPsDetail/data.go
+++ b/iSolarCloud/AppService/getPsDetail/data.go
@@ -29,12 +29,12 @@ 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"`
 
-	BuildDate                     valueTypes.DateTime  `json:"build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-	DataLastUpdateTime            valueTypes.DateTime  `json:"data_last_update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	ExpectInstallDate             valueTypes.DateTime  `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-	InstallDate                   valueTypes.DateTime  `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-	RecordCreateTime              valueTypes.DateTime  `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	SafeStartDate                 valueTypes.DateTime  `json:"safe_start_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	BuildDate                     valueTypes.DateTime  `json:"build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+	DataLastUpdateTime            valueTypes.DateTime  `json:"data_last_update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	ExpectInstallDate             valueTypes.DateTime  `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+	InstallDate                   valueTypes.DateTime  `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+	RecordCreateTime              valueTypes.DateTime  `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	SafeStartDate                 valueTypes.DateTime  `json:"safe_start_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	ActualEnergyUnit              valueTypes.String    `json:"actual_energy_unit" PointId:"actual_energy_unit"  PointIgnore:"true"`
 	AlarmCount                    valueTypes.Count     `json:"alarm_count"`
 	AreaId                        interface{}          `json:"area_id"`
@@ -218,7 +218,7 @@ type ResultData struct {
 	StorageInverterData []struct {
 		GoStruct                GoStruct.GoStruct    `json:"-" PointIdReplace:"true" PointIdFrom:"PsKey" PointDeviceFrom:"PsKey"`
 
-		UpdateTime              valueTypes.DateTime  `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UpdateTime              valueTypes.DateTime  `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		PsKey                   valueTypes.PsKey     `json:"ps_key"`
 		CommunicationDevSn      valueTypes.String    `json:"communication_dev_sn"`
 		DevFaultStatus          valueTypes.Integer   `json:"dev_fault_status"`
diff --git a/iSolarCloud/AppService/getPsList/data.go b/iSolarCloud/AppService/getPsList/data.go
index f36621206..76003f1cd 100644
--- a/iSolarCloud/AppService/getPsList/data.go
+++ b/iSolarCloud/AppService/getPsList/data.go
@@ -52,9 +52,9 @@ type ResultData struct {
 // 	AreaId                    valueTypes.String         `json:"area_id"`
 // 	AreaType                  valueTypes.Integer        `json:"area_type"`
 // 	ArrearsStatus             valueTypes.Integer        `json:"arrears_status"`
-// 	BuildDate                 valueTypes.DateTime       `json:"build_date" PointUpdateFreq:"UpdateFreqBoot" PointNameDateFormat:"2006/01/02 15:04:05"`
-// 	ExpectInstallDate         valueTypes.DateTime       `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-// 	InstallDate               valueTypes.DateTime       `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+// 	BuildDate                 valueTypes.DateTime       `json:"build_date" PointUpdateFreq:"UpdateFreqBoot" PointNameDateFormat:"2006-01-02 15:04:05"`
+// 	ExpectInstallDate         valueTypes.DateTime       `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+// 	InstallDate               valueTypes.DateTime       `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 // 	BuildStatus               valueTypes.Integer        `json:"build_status" PointUpdateFreq:"UpdateFreqBoot"`
 // 	Co2Reduce                 valueTypes.UnitValue      `json:"co2_reduce"`
 // 	Co2ReduceTotal            valueTypes.UnitValue      `json:"co2_reduce_total" PointUpdateFreq:"UpdateFreqTotal"`
@@ -93,8 +93,8 @@ type ResultData struct {
 // 	OwnerFaultCount           valueTypes.Count          `json:"owner_fault_count"`
 // 	OwnerPsFaultStatus        valueTypes.Integer        `json:"owner_ps_fault_status"`
 // 	Producer                  valueTypes.String         `json:"producer"`
-// 	RecordCreateTime          valueTypes.DateTime       `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-// 	SafeStartDate             valueTypes.DateTime       `json:"safe_start_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+// 	RecordCreateTime          valueTypes.DateTime       `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+// 	SafeStartDate             valueTypes.DateTime       `json:"safe_start_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 // 	ShareType                 valueTypes.Integer        `json:"share_type"`
 // 	ShippingAddress           valueTypes.String         `json:"shipping_address"`
 // 	ShippingZipCode           valueTypes.String         `json:"shipping_zip_code"`
diff --git a/iSolarCloud/AppService/getPsListStaticData/data.go b/iSolarCloud/AppService/getPsListStaticData/data.go
index 258af1772..cd415dd1d 100644
--- a/iSolarCloud/AppService/getPsListStaticData/data.go
+++ b/iSolarCloud/AppService/getPsListStaticData/data.go
@@ -38,7 +38,7 @@ type ResultData struct {
 		DesignCapacity         valueTypes.Float    `json:"design_capacity" PointUnit:"W"`
 		GprsLatitude           valueTypes.Float    `json:"gprs_latitude"`
 		GprsLongitude          valueTypes.Float    `json:"gprs_longitude"`
-		InstallDate            valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		InstallDate            valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		InstallerPsFaultStatus valueTypes.Integer  `json:"installer_ps_fault_status"`
 		Latitude               valueTypes.Float    `json:"latitude"`
 		Location               valueTypes.String   `json:"location"`
diff --git a/iSolarCloud/AppService/getPsReport/data.go b/iSolarCloud/AppService/getPsReport/data.go
index 7ba1cb998..e10a4904c 100644
--- a/iSolarCloud/AppService/getPsReport/data.go
+++ b/iSolarCloud/AppService/getPsReport/data.go
@@ -58,7 +58,7 @@ type ResultData struct {
 }
 
 type TotalData struct {
-	MinDateId                      valueTypes.DateTime  `json:"min_date_id" PointNameDateFormat:"2006/01/02 15:04:05"`
+	MinDateId                      valueTypes.DateTime  `json:"min_date_id" PointNameDateFormat:"2006-01-02 15:04:05"`
 
 	Co2Reduce                      valueTypes.Float     `json:"co2_reduce" PointUnitFrom:"Co2ReduceOriginalUnit"`
 	Co2ReduceMap                   valueTypes.UnitValue `json:"co2_reduce_map"`
diff --git a/iSolarCloud/AppService/getPsUser/data.go b/iSolarCloud/AppService/getPsUser/data.go
index c3bceb525..78956333c 100644
--- a/iSolarCloud/AppService/getPsUser/data.go
+++ b/iSolarCloud/AppService/getPsUser/data.go
@@ -29,7 +29,7 @@ type ResultData struct {
 	BloodType                    valueTypes.String   `json:"blood_type"`
 	CountryId                    valueTypes.Integer  `json:"country_id"`
 	CountryName                  valueTypes.String   `json:"country_name"`
-	CreateDate                   valueTypes.DateTime `json:"create_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	CreateDate                   valueTypes.DateTime `json:"create_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	CreateUserId                 valueTypes.Integer  `json:"create_user_id"`
 	DiseaseHis                   valueTypes.String   `json:"disease_his"`
 	Email                        valueTypes.String   `json:"email"`
diff --git a/iSolarCloud/AppService/getPsWeatherList/data.go b/iSolarCloud/AppService/getPsWeatherList/data.go
index 27d10dff1..43d083f06 100644
--- a/iSolarCloud/AppService/getPsWeatherList/data.go
+++ b/iSolarCloud/AppService/getPsWeatherList/data.go
@@ -28,7 +28,7 @@ type ResultData struct {
 	WeatherList []struct {
 		GoStruct   GoStruct.GoStruct   `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"20060102" PointTimestampFrom:"DateTime"`
 
-		DateTime   valueTypes.DateTime `json:"date_time" PointNameDateFormat:"2006/01/02"`
+		DateTime   valueTypes.DateTime `json:"date_time" PointNameDateFormat:"2006-01-02"`
 		PsId       valueTypes.PsId     `json:"ps_id"`
 
 		Chill      valueTypes.Float    `json:"chill"`
diff --git a/iSolarCloud/AppService/getReportData/data.go b/iSolarCloud/AppService/getReportData/data.go
index 7510eaaa8..26816f73c 100644
--- a/iSolarCloud/AppService/getReportData/data.go
+++ b/iSolarCloud/AppService/getReportData/data.go
@@ -39,7 +39,7 @@ type DataList struct {
 	DateId     valueTypes.DateTime `json:"date_id" PointTimestampFrom:"UpdateTime" PointNameDateFormat:"20060102"`
 	PsId       valueTypes.PsId     `json:"ps_id" PointTimestampFrom:"UpdateTime"`
 	TimeStamp  valueTypes.Generic  `json:"time_stamp" PointTimestampFrom:"UpdateTime"` // Sad that this alternates between string and valueTypes.Integer.
-	UpdateTime valueTypes.DateTime `json:"update_time" PointTimestampFrom:"UpdateTime" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateTime valueTypes.DateTime `json:"update_time" PointTimestampFrom:"UpdateTime" PointNameDateFormat:"2006-01-02 15:04:05"`
 	DeviceName interface{}         `json:"device_name" PointTimestampFrom:"UpdateTime"`
 	UUID       interface{}         `json:"uuid" PointTimestampFrom:"UpdateTime"`
 	Co2Reduce  valueTypes.Float    `json:"co2_reduce" PointTimestampFrom:"UpdateTime"`
diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
index 0269ceb2a..3734267a8 100644
--- a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
+++ b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
@@ -29,23 +29,23 @@ type ResultData struct {
 	ReportEmailConfigInfoList []struct {
 		Email      valueTypes.String `json:"email"`
 		ReportList []struct {
-			CreateTime                 valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+			CreateTime                 valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 			CreateUserId               valueTypes.Integer  `json:"create_user_id"`
-			EmailAddTime               valueTypes.DateTime `json:"email_add_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+			EmailAddTime               valueTypes.DateTime `json:"email_add_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 			Id                         valueTypes.Integer  `json:"id"`
 			IsAllowEmailSend           valueTypes.Bool     `json:"is_allow_email_send"`
 			IsBank                     valueTypes.Bool     `json:"is_bank"`
 			IsCanRenewSendConfirmEmail valueTypes.Bool     `json:"is_can_renew_send_confirm_email"`
 			IsNewWeb                   valueTypes.Bool     `json:"is_new_web"`
 			OrderId                    valueTypes.Integer  `json:"order_id"`
-			ReSendConfirmEmailTime     valueTypes.DateTime `json:"re_send_confirm_email_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+			ReSendConfirmEmailTime     valueTypes.DateTime `json:"re_send_confirm_email_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 			ReportId                   valueTypes.Integer  `json:"report_id"`
 			ReportName                 valueTypes.String   `json:"report_name"`
 			SendEmail                  valueTypes.String   `json:"send_email"`
 			Status                     valueTypes.Bool     `json:"status"`
 			TimeDimension              valueTypes.Integer  `json:"time_dimension"`
 			Type                       valueTypes.Integer  `json:"type"`
-			UpdateTime                 valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+			UpdateTime                 valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 			UserId                     valueTypes.Integer  `json:"user_id"`
 		} `json:"report_list" DataTable:"true"`
 	} `json:"report_email_config_info_list"`
diff --git a/iSolarCloud/AppService/getSysMsg/data.go b/iSolarCloud/AppService/getSysMsg/data.go
index d067b122d..7fad54b25 100644
--- a/iSolarCloud/AppService/getSysMsg/data.go
+++ b/iSolarCloud/AppService/getSysMsg/data.go
@@ -28,10 +28,10 @@ type ResultData []struct {
 	GoStructParent        GoStruct.GoStructParent   `json:"-" DataTable:"true" DataTableSortOn:"CreateTime" PointIdReplace:"false"`
 
 	MsgId           valueTypes.Integer  `json:"msg_id"`
-	CreateTime      valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	PublishTime     valueTypes.DateTime `json:"publish_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	StartTime       valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	EndTime         valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	CreateTime      valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	PublishTime     valueTypes.DateTime `json:"publish_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	StartTime       valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	EndTime         valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	Ispublish       valueTypes.Bool     `json:"ispublish" PointId:"is_publish"`
 	UserName        valueTypes.String   `json:"user_name"`
 	UserId          valueTypes.Integer  `json:"user_id"`
diff --git a/iSolarCloud/AppService/getTemplateList/data.go b/iSolarCloud/AppService/getTemplateList/data.go
index c95def6c3..57300ca53 100644
--- a/iSolarCloud/AppService/getTemplateList/data.go
+++ b/iSolarCloud/AppService/getTemplateList/data.go
@@ -31,7 +31,7 @@ type ResultData struct {
 type Template struct {
 	TemplateId   valueTypes.Integer  `json:"template_id"`
 	TemplateName valueTypes.String `json:"template_name"`
-	UpdateTime   valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateTime   valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/login/data.go b/iSolarCloud/AppService/login/data.go
index 4d91e4e94..1e02b0a87 100644
--- a/iSolarCloud/AppService/login/data.go
+++ b/iSolarCloud/AppService/login/data.go
@@ -65,15 +65,15 @@ type ResultData struct {
 	Isdst                  valueTypes.Bool    `json:"isdst"`
 	Jobs                   interface{} `json:"jobs"`
 	Language               string      `json:"language"`
-	LoginFirstDate         valueTypes.DateTime      `json:"loginFirstDate" PointNameDateFormat:"2006/01/02 15:04:05"`
-	LoginFirstDate2        valueTypes.DateTime      `json:"loginFristDate" PointNameDateFormat:"2006/01/02 15:04:05"`
-	LoginLastDate          valueTypes.DateTime      `json:"loginLastDate" PointNameDateFormat:"2006/01/02 15:04:05"`
+	LoginFirstDate         valueTypes.DateTime      `json:"loginFirstDate" PointNameDateFormat:"2006-01-02 15:04:05"`
+	LoginFirstDate2        valueTypes.DateTime      `json:"loginFristDate" PointNameDateFormat:"2006-01-02 15:04:05"`
+	LoginLastDate          valueTypes.DateTime      `json:"loginLastDate" PointNameDateFormat:"2006-01-02 15:04:05"`
 	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:"2006/01/02 15:04:05"`
+	MinDate                valueTypes.DateTime      `json:"min_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	MobileTel              interface{} `json:"mobile_tel"`
 	OrgId                  string      `json:"org_id"`
 	OrgName                string      `json:"org_name"`
diff --git a/iSolarCloud/AppService/powerDevicePointList/data.go b/iSolarCloud/AppService/powerDevicePointList/data.go
index f50e56f57..2a2df9a99 100644
--- a/iSolarCloud/AppService/powerDevicePointList/data.go
+++ b/iSolarCloud/AppService/powerDevicePointList/data.go
@@ -27,7 +27,7 @@ func (rd RequestData) Help() string {
 type ResultData struct {
 	CurrentPage  valueTypes.Integer `json:"currentPage" PointIgnore:"true"`
 	PageDataList []struct {
-		CreateTime   valueTypes.DateTime `json:"create_time" PointIgnore:"true" PointNameDateFormat:"2006/01/02 15:04:05"`
+		CreateTime   valueTypes.DateTime `json:"create_time" PointIgnore:"true" PointNameDateFormat:"2006-01-02 15:04:05"`
 		DeviceType   valueTypes.Integer  `json:"device_type"`
 		Id           valueTypes.Integer  `json:"id"`
 		Period       valueTypes.Integer  `json:"period"`		// 0, 1, 2, 3, 4
diff --git a/iSolarCloud/AppService/psForcastInfo/data.go b/iSolarCloud/AppService/psForcastInfo/data.go
index ad2eca855..18f42b6ce 100644
--- a/iSolarCloud/AppService/psForcastInfo/data.go
+++ b/iSolarCloud/AppService/psForcastInfo/data.go
@@ -30,7 +30,7 @@ type ResultData struct {
 	AreaForecastList []struct {
 		GoStruct          GoStruct.GoStruct   `json:"-" PointIdReplace:"true" PointIdFrom:"DateTime" PointNameDateFormat:"20060102" PointTimestampFrom:"DateTime"`
 
-		DateTime          valueTypes.DateTime `json:"date_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		DateTime          valueTypes.DateTime `json:"date_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 
 		City              valueTypes.String   `json:"city"`
 		Chill             valueTypes.Float    `json:"chill"`
diff --git a/iSolarCloud/AppService/queryDeviceList/data.go b/iSolarCloud/AppService/queryDeviceList/data.go
index 15e014a79..00a5f2c14 100644
--- a/iSolarCloud/AppService/queryDeviceList/data.go
+++ b/iSolarCloud/AppService/queryDeviceList/data.go
@@ -148,7 +148,7 @@ type PointStruct struct {
 	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:"2006/01/02 15:04:05"`
+	TimeStamp              valueTypes.DateTime `json:"time_stamp" PointUpdateFreq:"UpdateFreq5Mins" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PointId                valueTypes.PointId  `json:"point_id" PointUpdateFreq:"UpdateFreqBoot"`
 	PointGroupName         valueTypes.String   `json:"point_group_name" PointUpdateFreq:"UpdateFreqBoot"`
 	PointName              valueTypes.String   `json:"point_name" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
@@ -160,7 +160,7 @@ type PointStruct struct {
 	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"`
-	DevPointLastUpdateTime valueTypes.DateTime `json:"dev_point_last_update_time" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreq5Mins" PointNameDateFormat:"2006/01/02 15:04:05"`
+	DevPointLastUpdateTime valueTypes.DateTime `json:"dev_point_last_update_time" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreq5Mins" PointNameDateFormat:"2006-01-02 15:04:05"`
 	IsPlatformDefaultUnit  valueTypes.Bool     `json:"is_platform_default_unit" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
 	IsShow                 valueTypes.Bool     `json:"is_show" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
 	OrderId                valueTypes.Integer  `json:"order_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
diff --git a/iSolarCloud/AppService/queryDeviceListForApp/data.go b/iSolarCloud/AppService/queryDeviceListForApp/data.go
index 5b4d0a37b..803d73c4d 100644
--- a/iSolarCloud/AppService/queryDeviceListForApp/data.go
+++ b/iSolarCloud/AppService/queryDeviceListForApp/data.go
@@ -46,7 +46,7 @@ type ResultData struct {
 		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:"2006/01/02 15:04:05"`
+		DeviceFactoryDate       valueTypes.DateTime `json:"device_factory_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		DeviceId                valueTypes.Integer  `json:"device_id"`
 		DeviceModel             valueTypes.String   `json:"device_model"`
 		DeviceModelCode         valueTypes.String   `json:"device_model_code"`
diff --git a/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go b/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go
index e8cdac782..2acb1d320 100644
--- a/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go
+++ b/iSolarCloud/AppService/queryDevicePointMinuteDataList/data.go
@@ -58,7 +58,7 @@ func (e *ResultData) UnmarshalJSON(data []byte) error {
 type DataPoint struct {
 	GoStruct.GoStructParent `json:"-" PointIdReplace:"true" PointIdFrom:"TimeStamp" PointNameDateFormat:"20060102-150405" PointTimestampFrom:"TimeStamp"`
 
-	TimeStamp               valueTypes.DateTime             `json:"time_stamp" PointNameDateFormat:"2006/01/02 15:04:05"`
+	TimeStamp               valueTypes.DateTime             `json:"time_stamp" PointNameDateFormat:"2006-01-02 15:04:05"`
 	Points                  map[string]valueTypes.UnitValue `json:"points"`
 	IsPlatformDefaultUnit   valueTypes.Bool                 `json:"is_platform_default_unit"`
 }
diff --git a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
index d327a0819..639b08b06 100644
--- a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
+++ b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
@@ -30,10 +30,10 @@ type ResultData struct {
 		FileName      valueTypes.String   `json:"file_name"`
 		FileSize      valueTypes.Integer  `json:"file_size"`
 		FileType      valueTypes.Integer  `json:"file_type"`
-		UploadTime    valueTypes.DateTime `json:"upload_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UploadTime    valueTypes.DateTime `json:"upload_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		URL           valueTypes.String   `json:"url"`
 		Operation     valueTypes.Integer  `json:"operation"`
-		OperationTime valueTypes.DateTime `json:"operation_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		OperationTime valueTypes.DateTime `json:"operation_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		OperatorId    valueTypes.String   `json:"operator_id"`
 		OperatorName  valueTypes.String   `json:"operator_name"`
 		System        valueTypes.String   `json:"system"`
diff --git a/iSolarCloud/AppService/queryMutiPointDataList/data.go b/iSolarCloud/AppService/queryMutiPointDataList/data.go
index 92b211fbe..39e43c42b 100644
--- a/iSolarCloud/AppService/queryMutiPointDataList/data.go
+++ b/iSolarCloud/AppService/queryMutiPointDataList/data.go
@@ -42,7 +42,7 @@ type Value struct {
 	GoStructParent  GoStruct.GoStructParent   `json:"-" PointIdFrom:"PsKey.Timestamp" PointIdReplace:"true"`
 	// GoStruct  GoStruct.GoStruct   `json:"-" PointIdFrom:"PsKey" PointIdReplace:"false" PointDeviceFrom:"PsKey"`
 
-	Timestamp valueTypes.DateTime `json:"timestamp" PointNameDateFormat:"2006/01/02 15:04:05"`
+	Timestamp valueTypes.DateTime `json:"timestamp" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsKey     valueTypes.PsKey    `json:"ps_key"`
 	Points    map[string]valueTypes.Generic	`json:"points" PointDeviceFrom:"PsKey"`
 }
@@ -301,5 +301,18 @@ func (e *EndPoint) GetData() api.DataMap {
 	entries := api.NewDataMap()
 	// entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
 	entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.EndPointPath{})
+
+	// table.InitGraph(output.GraphRequest {
+	// 	Title:        "",
+	// 	TimeColumn:   output.SetString("Date/Time"),
+	// 	SearchColumn: output.SetString("Point Id"),
+	// 	NameColumn:   output.SetString("Point Name"),
+	// 	ValueColumn:  output.SetString("Value"),
+	// 	UnitsColumn:  output.SetString("Units"),
+	// 	SearchString: output.SetString(""),
+	// 	MinLeftAxis:  output.SetFloat(0),
+	// 	MaxLeftAxis:  output.SetFloat(0),
+	// })
+
 	return entries
 }
diff --git a/iSolarCloud/AppService/queryPowerStationInfo/data.go b/iSolarCloud/AppService/queryPowerStationInfo/data.go
index e030e2a41..c90ba059d 100644
--- a/iSolarCloud/AppService/queryPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/queryPowerStationInfo/data.go
@@ -56,14 +56,14 @@ type ResultData struct {
 	DivisionCode          valueTypes.String   `json:"division_code"`
 	Email                 valueTypes.String   `json:"email"`
 	EnergyScheme          interface{}         `json:"energy_scheme"`
-	ExpectInstallDate     valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	ExpectInstallDate     valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	GcjLatitude           valueTypes.Float    `json:"gcj_latitude"`
 	GcjLongitude          valueTypes.Float    `json:"gcj_longitude"`
 	GprsLatitude          valueTypes.Float    `json:"gprs_latitude"`
 	GprsLongitude         valueTypes.Float    `json:"gprs_longitude"`
 	GridLevel             interface{}         `json:"grid_level"`
-	InstallDate           valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
-	InstallDateZone       valueTypes.DateTime `json:"install_date_zone" PointNameDateFormat:"2006/01/02 15:04:05"`
+	InstallDate           valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
+	InstallDateZone       valueTypes.DateTime `json:"install_date_zone" PointNameDateFormat:"2006-01-02 15:04:05"`
 	InverterCount         valueTypes.Integer  `json:"inverter_count"`
 	InvestmentType        valueTypes.Integer  `json:"investment_type"`
 	InvestmentTypeDesc    valueTypes.String   `json:"investment_type_desc"`
@@ -93,7 +93,7 @@ type ResultData struct {
 	ParamIncomeUnitName   valueTypes.String   `json:"param_income_unit_name"`
 	ProvinceCode          valueTypes.String   `json:"province_code"`
 	ProvinceName          valueTypes.String   `json:"province_name"`
-	PsBuildDate           valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	PsBuildDate           valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsCountryId           valueTypes.Integer  `json:"ps_country_id"`
 	PsCreateUserId        valueTypes.Integer  `json:"ps_create_user_id"`
 	PsCurrentTimeZone     valueTypes.String   `json:"ps_current_time_zone"`
@@ -109,8 +109,8 @@ type ResultData struct {
 	PsTypeDesc            valueTypes.String   `json:"ps_type_desc"`
 	PsTypeName            valueTypes.String   `json:"ps_type_name"`
 	PsUserId              valueTypes.Integer  `json:"ps_user_id"`
-	RecordCreateTime      valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	SafeStartDate         valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	RecordCreateTime      valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	SafeStartDate         valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	SetUserOrg            valueTypes.Integer  `json:"set_user_org"`
 	ShareType             valueTypes.Integer  `json:"share_type"`
 	ShareUserType         interface{}         `json:"share_user_type"`
diff --git a/iSolarCloud/AppService/queryPsProfit/data.go b/iSolarCloud/AppService/queryPsProfit/data.go
index 9369dbd4c..b849445d2 100644
--- a/iSolarCloud/AppService/queryPsProfit/data.go
+++ b/iSolarCloud/AppService/queryPsProfit/data.go
@@ -33,8 +33,8 @@ type ResultData struct {
 	ActualList []struct {
 		GoStruct                 GoStruct.GoStruct   `json:"-" PointIdReplace:"true" PointIdFrom:"DateId" PointNameDateFormat:"20060102" PointTimestampFrom:"UpdateTime"`
 
-		DateId                   valueTypes.DateTime `json:"date_id" PointNameDateFormat:"2006/01/02" PointTimestampFrom:"UpdateTime"`
-		UpdateTime               valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		DateId                   valueTypes.DateTime `json:"date_id" PointNameDateFormat:"2006-01-02" PointTimestampFrom:"UpdateTime"`
+		UpdateTime               valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 
 		NetPowerProfit           valueTypes.Float    `json:"net_power_profit" PointTimestampFrom:"UpdateTime"`
 		SubsidyProfit            interface{}         `json:"subsidy_profit" PointTimestampFrom:"UpdateTime"`
diff --git a/iSolarCloud/AppService/reportList/data.go b/iSolarCloud/AppService/reportList/data.go
index 4dbbad958..166fd8208 100644
--- a/iSolarCloud/AppService/reportList/data.go
+++ b/iSolarCloud/AppService/reportList/data.go
@@ -45,7 +45,7 @@ type DataList struct {
 	DateId     valueTypes.DateTime `json:"date_id"     PointTimestampFrom:"UpdateTime" PointNameDateFormat:"20060102"`
 	PsId       valueTypes.PsId     `json:"ps_id"       PointTimestampFrom:"UpdateTime"`
 	TimeStamp  valueTypes.Generic  `json:"time_stamp"  PointTimestampFrom:"UpdateTime"` // Sad that this alternates between string and valueTypes.Integer.
-	UpdateTime valueTypes.DateTime `json:"update_time" PointTimestampFrom:"UpdateTime" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateTime valueTypes.DateTime `json:"update_time" PointTimestampFrom:"UpdateTime" PointNameDateFormat:"2006-01-02 15:04:05"`
 	DeviceName interface{}         `json:"device_name" PointTimestampFrom:"UpdateTime"`
 	UUID       interface{}         `json:"uuid"        PointTimestampFrom:"UpdateTime"`
 	Co2Reduce  valueTypes.Float    `json:"co2_reduce"  PointTimestampFrom:"UpdateTime"`
diff --git a/iSolarCloud/WebAppService/getPsList/data.go b/iSolarCloud/WebAppService/getPsList/data.go
index f33401276..c724b3c4c 100644
--- a/iSolarCloud/WebAppService/getPsList/data.go
+++ b/iSolarCloud/WebAppService/getPsList/data.go
@@ -33,7 +33,7 @@ type ResultData []struct {
 	ArrearsStatus      valueTypes.Integer  `json:"arrears_status"`
 	DesignCapacity     valueTypes.Float    `json:"design_capacity" PointUnitFrom:"DesignCapacityUnit"`
 	DesignCapacityUnit valueTypes.String   `json:"design_capacity_unit" PointIgnore:"true"`
-	InstallDate        valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	InstallDate        valueTypes.DateTime `json:"install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsCode             valueTypes.String   `json:"ps_code"`
 	PsCountryId        valueTypes.Integer  `json:"ps_country_id"`
 	PsLocation         valueTypes.String   `json:"ps_location"`
diff --git a/iSolarCloud/WebAppService/getPsValue/data.go b/iSolarCloud/WebAppService/getPsValue/data.go
index 4aab65d98..762899121 100644
--- a/iSolarCloud/WebAppService/getPsValue/data.go
+++ b/iSolarCloud/WebAppService/getPsValue/data.go
@@ -36,7 +36,7 @@ type ResultData []struct {
 	PsStatus      valueTypes.Integer  `json:"ps_status"`
 	PsType        valueTypes.Integer  `json:"ps_type"`
 	State         valueTypes.Bool     `json:"state"`
-	UpdateTime    valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateTime    valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	PsFaultStatus valueTypes.Integer  `json:"ps_fault_status"`
 
 	ArrearsStatus  valueTypes.Integer `json:"arrears_status"`
@@ -45,7 +45,7 @@ type ResultData []struct {
 		Value valueTypes.Float  `json:"value" PointUnitFrom:"Unit"`
 	} `json:"design_capacity"`
 	DesignCapacityOriginal valueTypes.Float    `json:"design_capacity_original"`
-	DeviceStatusUpdateTime valueTypes.DateTime `json:"device_status_update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	DeviceStatusUpdateTime valueTypes.DateTime `json:"device_status_update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	EquivalentHour         valueTypes.Integer  `json:"equivalent_hour"`
 	GcjLatitude            valueTypes.Float    `json:"gcj_latitude"`
 	GcjLongitude           valueTypes.Float    `json:"gcj_longitude"`
diff --git a/iSolarCloud/WebAppService/getReportListByType/data.go b/iSolarCloud/WebAppService/getReportListByType/data.go
index 34c8a43ab..0da55c5af 100644
--- a/iSolarCloud/WebAppService/getReportListByType/data.go
+++ b/iSolarCloud/WebAppService/getReportListByType/data.go
@@ -28,7 +28,7 @@ func (rd RequestData) Help() string {
 type ResultData []struct {
 	GoStructParent   GoStruct.GoStructParent   `json:"GoStruct" DataTable:"true" DataTableSortOn:"CreateTime"`
 
-	CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	CreateTime valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	Cycle      valueTypes.Integer  `json:"cycle"`
 	ID         valueTypes.Integer  `json:"id"`
 	MonthDate  valueTypes.String   `json:"month_date"`
@@ -36,7 +36,7 @@ type ResultData []struct {
 	ReportName valueTypes.String   `json:"report_name"`
 	ReportType valueTypes.Integer  `json:"report_type"`
 	Status     valueTypes.Bool     `json:"status"`
-	UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
index a903bfc04..12e315f65 100644
--- a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
+++ b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
@@ -37,11 +37,11 @@ func (rd RequestData) Help() string {
 
 // ResultData (struct) -> PointsData(struct) -> Devices(map[string]DeviceData) -> Points(map[string]Point)
 type ResultData struct {
-	CreateTime   valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	OpenTime     valueTypes.DateTime `json:"open_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	UpdateTime   valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	StartTime    valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006/01/02 15:04:05"`
-	EndTime      valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	CreateTime   valueTypes.DateTime `json:"create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	OpenTime     valueTypes.DateTime `json:"open_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	UpdateTime   valueTypes.DateTime `json:"update_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	StartTime    valueTypes.DateTime `json:"start_time" PointNameDateFormat:"2006-01-02 15:04:05"`
+	EndTime      valueTypes.DateTime `json:"end_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	DateType     valueTypes.Integer  `json:"date_type"`
 	Cycle        valueTypes.Integer  `json:"cycle"`
 	TemplateId   valueTypes.Integer  `json:"template_id"`
diff --git a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
index f0f275cb7..372d813f5 100644
--- a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
@@ -40,7 +40,7 @@ type ResultData struct {
 	Remark            valueTypes.String   `json:"remark"`
 	SysId             valueTypes.String   `json:"sys_id"`
 	SysType           valueTypes.String   `json:"sys_type"`
-	UpdateDate        valueTypes.DateTime `json:"updatedate" PointId:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateDate        valueTypes.DateTime `json:"updatedate" PointId:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	UpdateUserCode    valueTypes.Bool     `json:"updateusercode" PointId:"update_user_code"`
 }
 
diff --git a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
index 0e6d1e37f..6e7e526f1 100644
--- a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
@@ -27,7 +27,7 @@ func (rd RequestData) Help() string {
 type ResultData []struct {
 	GoStructParent GoStruct.GoStructParent  `json:"-" DataTable:"true" DataTableSortOn:"DeploymentTime"`
 
-	DeploymentTime valueTypes.DateTime `json:"deploymentTime" PointId:"deployment_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+	DeploymentTime valueTypes.DateTime `json:"deploymentTime" PointId:"deployment_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 	Id             valueTypes.String   `json:"id"`
 	Name           valueTypes.String   `json:"name"`
 }
diff --git a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
index 4301e3371..ee42ad7f9 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
@@ -71,7 +71,7 @@ type ResultData struct {
 		Phone                     valueTypes.String   `json:"phone"`
 		Protocol                  valueTypes.String   `json:"protocol"`
 		Remark                    valueTypes.String   `json:"remark"`
-		UpdateDate                valueTypes.DateTime `json:"updatedate" PointId:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UpdateDate                valueTypes.DateTime `json:"updatedate" PointId:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		UpdateUserCode            valueTypes.Bool     `json:"updateusercode" PointId:"update_user_code"`
 	} `json:"powerDeviceModel"`
 	SysTypeList []struct {
@@ -101,7 +101,7 @@ type ResultData struct {
 		SysId           valueTypes.String   `json:"sys_id"`
 		SysName         valueTypes.String   `json:"sys_name"`
 		IsRemoteUpgrade valueTypes.Bool     `json:"is_remote_upgrade"`
-		UpdateDate      valueTypes.DateTime `json:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UpdateDate      valueTypes.DateTime `json:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		ValidFlag       valueTypes.Bool     `json:"valid_flag"`
 	} `json:"deviceTypeList" PointId:"device_type_list" DataTable:"true" DataTableSortOn:"TypeId"`
 }
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
index ac355a1e0..e570f8fbe 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
@@ -37,12 +37,12 @@ type ResultData struct {
 		TechCode           valueTypes.String   `json:"tech_code"`
 		TechContent        valueTypes.String   `json:"tech_content"`
 		TechContentTransId valueTypes.Integer  `json:"tech_content_trans_id"`
-		TechCreateTime     valueTypes.DateTime `json:"tech_createtime" PointId:"tech_create_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		TechCreateTime     valueTypes.DateTime `json:"tech_createtime" PointId:"tech_create_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		TechCreator        valueTypes.String   `json:"tech_creator"`
 		TechDescription    interface{}         `json:"tech_description"`
 		TechId             valueTypes.Integer  `json:"tech_id"`
 		TechModifier       interface{}         `json:"tech_modifier"`
-		TechModifyTime     valueTypes.DateTime `json:"tech_modifytime" PointId:"tech_modify_time" PointNameDateFormat:"2006/01/02 15:04:05"`
+		TechModifyTime     valueTypes.DateTime `json:"tech_modifytime" PointId:"tech_modify_time" PointNameDateFormat:"2006-01-02 15:04:05"`
 		TechName           valueTypes.String   `json:"tech_name"`
 		TypeId             valueTypes.Integer  `json:"type_id"`
 		TypeName           valueTypes.String   `json:"type_name"`
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
index 283f66dd7..e9bd12f5d 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
@@ -27,7 +27,7 @@ func (rd RequestData) Help() string {
 
 type ResultData   struct {
 	PowerDeviceTypeMap struct {
-		UpdateDate      valueTypes.DateTime  `json:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		UpdateDate      valueTypes.DateTime  `json:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		SysId           valueTypes.String  `json:"sys_id"`
 		SysName         valueTypes.String  `json:"sys_name"`
 		TypeCode        valueTypes.Integer `json:"type_code"`
diff --git a/iSolarCloud/WebIscmAppService/getOrgList/data.go b/iSolarCloud/WebIscmAppService/getOrgList/data.go
index 1144dc764..fe40be56a 100644
--- a/iSolarCloud/WebIscmAppService/getOrgList/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgList/data.go
@@ -56,7 +56,7 @@ type ResultData []struct {
 	RegisteredAddress       valueTypes.String   `json:"registered_address"`
 	RegisteredArea          valueTypes.String   `json:"registered_area"`
 	RegisteredCapital       valueTypes.Integer  `json:"registered_capital"`
-	RegisteredDate          valueTypes.DateTime `json:"registered_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	RegisteredDate          valueTypes.DateTime `json:"registered_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	ServiceEmail            valueTypes.String   `json:"service_emaill" PointId:"service_email"`
 	TaxCertificate          valueTypes.String   `json:"tax_certificate"`
 	TelNo                   valueTypes.String   `json:"tel_no"`
diff --git a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
index b9be04f18..608d3d23e 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
@@ -39,7 +39,7 @@ type ResultData struct {
 	PsGUID           valueTypes.String   `json:"psGuid" PointId:"ps_guid"`
 	SnCode           interface{}         `json:"snCode" PointId:"sn_code"`
 	SyncDate         interface{}         `json:"syncDate" PointId:"sync_date"`
-	UpdateDate       valueTypes.DateTime `json:"updateDate" PointId:"update_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+	UpdateDate       valueTypes.DateTime `json:"updateDate" PointId:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	UpdateUserCode   interface{}         `json:"updateUserCode" PointId:"update_user_code"`
 }
 
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
index e2afe88b7..3b34c5e01 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
@@ -28,7 +28,7 @@ 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:"2006/01/02 15:04:05"`
+	UpdateDate      valueTypes.DateTime     `json:"update_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 	SysId           valueTypes.String       `json:"sys_id"`
 	SysName         valueTypes.String       `json:"sys_name"`
 	TypeId          valueTypes.Integer      `json:"type_id"`
diff --git a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
index 0bd074cd0..45a7bd50b 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
@@ -82,7 +82,7 @@ type ResultData struct {
 		AccessType        Common.Unknown      `json:"access_type"`
 		AreaType          Common.Unknown      `json:"area_type"`
 		AreaId            Common.Unknown      `json:"areaid" PointId:"area_id"`
-		BuildDate         valueTypes.DateTime `json:"build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		BuildDate         valueTypes.DateTime `json:"build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		BuildStatus       valueTypes.Integer  `json:"buildstatus" PointId:"build_status"`
 		CapitalType       valueTypes.Integer  `json:"capitaltype" PointId:"capital_type"`
 		City              Common.Unknown      `json:"city"`
@@ -91,13 +91,13 @@ type ResultData struct {
 		DistrictFlag      valueTypes.Integer  `json:"district_flag"`
 		DivisionCode      Common.Unknown      `json:"division_code"`
 		Email             valueTypes.String   `json:"email"`
-		ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		ExpectInstallDate valueTypes.DateTime `json:"expect_install_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		FaultSendType     Common.Unknown      `json:"fault_send_type"`
 		GcjLatitude       valueTypes.Float    `json:"gcj_latitude"`
 		GcjLongitude      valueTypes.Float    `json:"gcj_longitude"`
 		GprsLatitude      valueTypes.Float    `json:"gprs_latitude"`
 		GprsLongitude     valueTypes.Float    `json:"gprs_longitude"`
-		InstallDate       valueTypes.DateTime `json:"installdate" PointNameDateFormat:"2006/01/02 15:04:05"`
+		InstallDate       valueTypes.DateTime `json:"installdate" PointNameDateFormat:"2006-01-02 15:04:05"`
 		InvestmentType    valueTypes.Integer  `json:"investment_type"`
 		Latitude          valueTypes.Float    `json:"latitude"`
 		Longitude         valueTypes.Float    `json:"longitude"`
@@ -119,7 +119,7 @@ type ResultData struct {
 		Producer          Common.Unknown      `json:"producer"`
 		Prov              Common.Unknown      `json:"prov"`
 		ProvCode          Common.Unknown      `json:"prov_code"`
-		PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		PsBuildDate       valueTypes.DateTime `json:"ps_build_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		PsCountryId       valueTypes.Integer  `json:"ps_country_id"`
 		PsCode            valueTypes.String   `json:"pscode" PointId:"ps_code"`
 		PsDesc            Common.Unknown      `json:"psdesc" PointId:"ps_desc"`
@@ -130,7 +130,7 @@ type ResultData struct {
 		PsNameEnus        Common.Unknown      `json:"psnameenus" PointId:"ps_name_enus"`
 		PsOrgId           Common.Unknown      `json:"psorgid" PointId:"ps_org_id"`
 		PsOrgName         Common.Unknown      `json:"psorgname" PointId:"ps_org_name"`
-		SafeStartDate     valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		SafeStartDate     valueTypes.DateTime `json:"safe_start_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		SchedulingType    valueTypes.Integer  `json:"schedulingtype" PointId:"scheduling_type"`
 		Shortname         valueTypes.String   `json:"shortname"`
 		Sn                valueTypes.String   `json:"sn"`
@@ -154,7 +154,7 @@ type ResultData struct {
 		ChannelDesc  Common.Unknown      `json:"chnnl_desc" PointId:"channel_description"`
 		ChannelId    valueTypes.Integer  `json:"chnnl_id" PointId:"channel_id"`
 		ChannelName  valueTypes.String   `json:"chnnl_name" PointId:"channel_name"`
-		CrtDate      valueTypes.DateTime `json:"crt_date" PointId:"create_date" PointNameDateFormat:"2006/01/02 15:04:05"`
+		CrtDate      valueTypes.DateTime `json:"crt_date" PointId:"create_date" PointNameDateFormat:"2006-01-02 15:04:05"`
 		CrtUserName  Common.Unknown      `json:"crt_user_name" PointId:"create_username"`
 		DataFlag     valueTypes.Integer  `json:"data_flag"`
 		FlagServer   Common.Unknown      `json:"flag_server"`
diff --git a/iSolarCloud/api/GoStruct/legacy.go b/iSolarCloud/api/GoStruct/legacy.go
index 1bfce75c5..2731b53e3 100644
--- a/iSolarCloud/api/GoStruct/legacy.go
+++ b/iSolarCloud/api/GoStruct/legacy.go
@@ -100,3 +100,253 @@ package GoStruct
 //
 // 	return &ret
 // }
+
+// -------------------------------------------------------------------------------- //
+// From structmap.go
+//
+//
+// func (sm *StructMap) GetTables() StructTables {
+// 	var ret StructTables
+//
+// 	for range Only.Once {
+// 		st := sm.GetResultTableData()
+// 		ret = append(ret, st)
+//
+// 		names := sm.GetTableNames()
+// 		for _, name := range names {
+// 			st = sm.GetTableData(name)
+// 			if !st.IsValid {
+// 				continue
+// 			}
+// 			ret = append(ret, st)
+// 		}
+//
+// 	}
+//
+// 	return ret
+// }
+//
+// func (sm *StructMap) GetTableData(name string) *StructTable {
+// 	var ret StructTable
+//
+// 	for range Only.Once {
+// 		if current, ok := sm.TableMap[name]; ok {
+// 			sm.Error = ret.Process(name, current)
+// 			_, _ = ret.CreateTable()
+// 			break
+// 		}
+//
+// 		sm.PrintDebug("GetTableData(%s) - UNKNOWN path:%s type:%s\n", name, ret.Current.FieldPath, ret.Current.Kind)
+// 	}
+//
+// 	// for range Only.Once {
+// 	// 	var ok bool
+// 	// 	if ret.Current, ok = sm.TableMap[name]; !ok {
+// 	// 		break
+// 	// 	}
+// 	//
+// 	// 	ret.Name = ret.Current.Name()
+// 	// 	ret.IsValid = true
+// 	//
+// 	// 	if ret.Current.DataStructure.DataTableIndex {
+// 	// 		ret.ShowIndex = ret.Current.DataStructure.DataTableIndex
+// 	// 	}
+// 	//
+// 	// 	ret.IndexTitle = "Index"
+// 	// 	if ret.Current.DataStructure.DataTableIndexTitle != "" {
+// 	// 		ret.IndexTitle = ret.Current.DataStructure.DataTableIndexTitle
+// 	// 	}
+// 	//
+// 	//
+// 	// 	ret.Rows, ret.Cols = ret.Current.CountChildren()
+// 	// 	var isPivot bool
+// 	// 	if ret.Current.DataStructure.DataTablePivot {
+// 	// 		isPivot = true
+// 	// 	}
+// 	// 	if ret.Cols <= 1 {
+// 	// 		isPivot = true
+// 	// 	}
+// 	//
+// 	// 	// if rows == 0 {
+// 	// 	// 	// var refs ReflectArray
+// 	// 	// 	for row, Child := range ret.Current.Value.Range(true) {
+// 	// 	// 		fmt.Printf("GetTableData() row[%d]: %s - %s == %s\n", row, Child, Child.ValueKey(), Child.StringValue)
+// 	// 	//
+// 	// 	// 		// var refRow ReflectArrayRow
+// 	// 	// 		// refRow = append(refRow, ChildStruct)
+// 	// 	// 		//
+// 	// 	// 		// if len(refRow) > 0 {
+// 	// 	// 		// 	refs = refs.AddRow(refRow...)
+// 	// 	// 		// 	continue
+// 	// 	// 		// }
+// 	// 	//
+// 	// 	// 		// Single column.
+// 	// 	// 		ret.ShowIndex = true
+// 	// 	// 		// refs = refs.AddRow(Child)
+// 	// 	// 	}
+// 	// 	// 	break
+// 	// 	// }
+// 	//
+// 	// 	sm.PrintDebug("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, ret.Rows, ret.Cols)
+// 	// 	if ret.Current.IsPointIgnore() {
+// 	// 		break
+// 	// 	}
+// 	//
+// 	// 	var refs ReflectArray
+// 	// 	for row, Child := range ret.Current.ChildReflect {
+// 	// 		sm.PrintDebug("GetTableData() row[%d]: %s\n", row, Child)
+// 	// 		if Child.IsPointIgnore() {
+// 	// 			continue
+// 	// 		}
+// 	//
+// 	// 		var refRow ReflectArrayRow
+// 	//
+// 	// 		for col, ChildStruct := range Child.ChildReflect {
+// 	// 			sm.PrintDebug("GetTableData() cell[%d][%d]: %s\n", row, col, Child)
+// 	// 			if ChildStruct.IsPointIgnore() {
+// 	// 				continue
+// 	// 			}
+// 	//
+// 	// 			// Make sure we have a valid sort column name.
+// 	// 			if ret.Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+// 	// 				ret.SortOn = ChildStruct.DataStructure.PointName
+// 	// 			}
+// 	//
+// 	// 			if ChildStruct.IsKnown() {
+// 	// 				refRow = append(refRow, ChildStruct)
+// 	// 				continue
+// 	// 			}
+// 	// 			refRow = append(refRow, ChildStruct)
+// 	// 		}
+// 	//
+// 	// 		if len(refRow) > 0 {
+// 	// 			if ret.ActualCols < len(refRow) {
+// 	// 				ret.ActualCols = len(refRow)
+// 	// 			}
+// 	// 			refs = refs.AddRow(refRow...)
+// 	// 			continue
+// 	// 		}
+// 	//
+// 	// 		// Single column.
+// 	// 		ret.ShowIndex = true
+// 	// 		if Child.IsPointIgnore() {
+// 	// 			continue
+// 	// 		}
+// 	// 		if ret.ActualCols < len(refRow) {
+// 	// 			ret.ActualCols = len(refRow)
+// 	// 		}
+// 	// 		refs = refs.AddRow(Child)
+// 	// 	}
+// 	//
+// 	// 	if refs == nil {
+// 	// 		break
+// 	// 	}
+// 	//
+// 	// 	if !isPivot {
+// 	// 		ret.Reflects = refs
+// 	// 		// ret.AddHeader(ret.Reflects[0]...)
+// 	// 		break
+// 	// 	}
+// 	//
+// 	// 	// Handle table pivots here.
+// 	// 	for row := 0; row < len(refs[0]); row++ {
+// 	// 		var refRow ReflectArrayRow
+// 	// 		for col := 0; col < len(refs); col++ {
+// 	// 			refRow = append(refRow, refs[col][row])
+// 	// 		}
+// 	// 		if len(refRow) > 0 {
+// 	// 			ret.Reflects = ret.Reflects.AddRow(refRow...)
+// 	// 		}
+// 	// 	}
+// 	// }
+//
+// 	return &ret
+// }
+//
+// func (sm *StructMap) GetResultTableData() StructTable {
+// 	var ret StructTable
+//
+// 	fmt.Printf("NOT IMPLEMENTED YET.\n")
+// 	// for range Only.Once {
+// 	// 	var sorted []string
+// 	// 	// @TODO - Add in other column sorting options here.
+// 	// 	for name := range sm.Map {
+// 	// 		sorted = append(sorted, name)
+// 	// 	}
+// 	//
+// 	// 	ret.Name = "Results"
+// 	// 	ret.IsValid = true
+// 	//
+// 	// 	for _, name := range sorted {
+// 	// 		Current := sm.Map[name]
+// 	//
+// 	// 		rows, cols := Current.CountChildren()
+// 	// 		// fmt.Printf("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, rows, cols)
+// 	// 		sm.PrintDebug("GetResultTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, Current.FieldPath, Current.Kind, rows, cols)
+// 	// 		if Current.IsPointIgnore() {
+// 	// 			break
+// 	// 		}
+// 	//
+// 	// 		// if len(refs) > 0 {
+// 	// 		// 	ret.AddRow(refs...)
+// 	// 		// }
+// 	//
+// 	// 		// for row, Child := range Current.ChildReflect {
+// 	// 		// 	fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d\n", Child.FieldPath, ret.Current.Kind,
+// 	// 		// 		Child.IsKnown(),
+// 	// 		// 		len(ret.Current.ChildReflect),
+// 	// 		// 		len(Child.ChildReflect))
+// 	// 		// 	if sm.Debug {
+// 	// 		// 		_, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() row[%d]: %s\n", row, Child)
+// 	// 		// 	}
+// 	// 		// 	if Child.IsPointIgnore() {
+// 	// 		// 		continue
+// 	// 		// 	}
+// 	// 		//
+// 	// 		// 	var refs []*Reflect
+// 	// 		//
+// 	// 		// 	for col, ChildStruct := range Child.ChildReflect {
+// 	// 		// 		// fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d / ChildStruct:%d\n", ChildStruct.FieldPath, ret.Current.Kind,
+// 	// 		// 		// 	ChildStruct.IsKnown(),
+// 	// 		// 		// 	len(ret.Current.ChildReflect),
+// 	// 		// 		// 	len(Child.ChildReflect),
+// 	// 		// 		// 	len(ChildStruct.ChildReflect))
+// 	// 		// 		if sm.Debug {
+// 	// 		// 			_, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() cell[%d][%d]: %s\n", row, col, Child)
+// 	// 		// 		}
+// 	// 		// 		if ChildStruct.IsPointIgnore() {
+// 	// 		// 			continue
+// 	// 		// 		}
+// 	// 		//
+// 	// 		// 		// Make sure we have a valid sort column name.
+// 	// 		// 		if Current.DataStructure.DataTableSortOn != "" {
+// 	// 		// 			if Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+// 	// 		// 				ret.SortOn = ChildStruct.DataStructure.PointName
+// 	// 		// 			}
+// 	// 		// 		}
+// 	// 		//
+// 	// 		// 		if ChildStruct.IsKnown() {
+// 	// 		// 			refs = append(refs, ChildStruct)
+// 	// 		// 			continue
+// 	// 		// 		}
+// 	// 		// 		refs = append(refs, ChildStruct)
+// 	// 		// 	}
+// 	// 		//
+// 	// 		// 	if len(refs) > 0 {
+// 	// 		// 		ret.AddRow(refs...)
+// 	// 		// 	}
+// 	// 	}
+// 	// }
+//
+// 	return ret
+// }
+//
+// func (sm *StructMap) GetTableNames() []string {
+// 	var ret []string
+// 	for name := range sm.TableMap {
+// 		ret = append(ret, name)
+// 	}
+// 	return ret
+// }
+//
+
diff --git a/iSolarCloud/api/GoStruct/output/struct_graph.go b/iSolarCloud/api/GoStruct/output/struct_graph.go
index 3281ce6a0..a9ec88203 100644
--- a/iSolarCloud/api/GoStruct/output/struct_graph.go
+++ b/iSolarCloud/api/GoStruct/output/struct_graph.go
@@ -1,35 +1,36 @@
 package output
 
 import (
-	"github.com/MickMake/GoUnify/Only"
+	"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"
-	"strconv"
 	"strings"
 	"time"
 )
 // 	"go.pennock.tech/tabular"
 // 	tabular "github.com/agrison/go-tablib"
 
+
 type GraphRequest struct {
 	Title        string  `json:"title"`
 
-	TimeColumn   *string  `json:"time_column"`
-	ValueColumn  *string  `json:"value_column"`
-	UnitsColumn  *string  `json:"units_column"`
-	NameColumn   *string  `json:"name_column"`
-	SearchColumn *string  `json:"search_column"`
-	SearchString *string  `json:"search_string"`
+	TimeColumn  *string  `json:"time_column"`
+	DataColumn  *string  `json:"value_column"`
+	UnitsColumn *string  `json:"units_column"`
+	NameColumn  *string  `json:"name_column"`
+	DataUnit    *string  `json:"unit"`
+	DataMin     *float64 `json:"min"`
+	DataMax     *float64 `json:"max"`
+	Width       *int     `json:"width"`
+	Height      *int     `json:"height"`
 
-	MinLeftAxis  *float64 `json:"min_left_axis"`
-	MaxLeftAxis  *float64 `json:"max_left_axis"`
-
-	Width        *int     `json:"width"`
-	Height       *int     `json:"height"`
+	// DataColumn   *string  `json:"data_column"`
+	// SearchString *string  `json:"search_string"`
 
 	Error        error   `json:"-"`
 }
@@ -62,7 +63,8 @@ func JsonToGraphRequest(j Json) GraphRequest {
 
 func (t *Table) InitGraph(req GraphRequest) {
 	if t.graph == nil {
-		t.graph = New(req.Title)
+		t.graph = New()
+		_ = t.graph.SetTitle(req.Title)
 	}
 
 	t.graph.req = req
@@ -71,7 +73,14 @@ func (t *Table) InitGraph(req GraphRequest) {
 func (t *Table) SetGraph(req GraphRequest) error {
 	for range Only.Once {
 		if t.graph == nil {
-			t.graph = New(req.Title)
+			t.graph = New()
+		}
+
+		t.graph.req = req
+
+		_ = t.graph.SetTitle(req.Title)
+		if t.Error != nil {
+			break
 		}
 
 		t.graph.SetWidth(req.Width)
@@ -84,7 +93,7 @@ func (t *Table) SetGraph(req GraphRequest) error {
 			break
 		}
 
-		changed := t.graph.SetGraphSearch(req)
+		changed := t.graph.SetColumns(req)
 		if !changed {
 			break
 		}
@@ -92,7 +101,7 @@ func (t *Table) SetGraph(req GraphRequest) error {
 			break
 		}
 
-		t.graph.SetRangeY(req.MinLeftAxis, req.MaxLeftAxis)
+		t.graph.SetRangeY(req.DataMin, req.DataMax)
 		if t.Error != nil {
 			break
 		}
@@ -124,156 +133,179 @@ func (t *Table) SetGraphFromJson(j Json) error {
 }
 
 
-func (t *Table) GetSearchColumn() SearchStrings {
-	return t.graph.otherSearch
-}
+// func (t *Table) GetSearchColumn() SearchStrings {
+// 	return t.graph.otherSearch
+// }
 
 func (t *Table) ProcessGraphData() error {
-	for range Only.Once {
-		fmt.Println("This is currently broken!")
-		break
-		req := t.graph.req
-
-		t.graph.searchName = ""
-		var units string
-		var times []time.Time
-		var values []float64
-		for row := 0; row < t.RowLength(); row++ {
-			// Get the search column
-			var cell interface{}
-			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.SearchColumn})
-			cell, t.Error = t.GetCell(row, *req.SearchColumn)
-			if t.Error != nil {
-				continue
-			}
-			// if !strings.Contains(cell.String(), *req.SearchString) {
-			// 	continue
-			// }
-
-			if req.Title == "" {
-				t.SetTitle(cell.(string))
-			}
-
-			if t.graph.searchName == "" {
-				if req.NameColumn != nil {
-					// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.NameColumn})
-					cell, t.Error = t.GetCell(row, *req.NameColumn)
-					if t.Error != nil {
-						continue
-					}
-					t.graph.searchName = cell.(string)
-				}
-			}
-
-			// Get units
-			if units == "" {
-				if req.UnitsColumn != nil {
-					// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.UnitsColumn})
-					cell, t.Error = t.GetCell(row, *req.UnitsColumn)
-					if t.Error != nil {
-						continue
-					}
-					units = cell.(string)
-				}
-			}
-
-			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.TimeColumn})
-			cell, t.Error = t.GetCell(row, *req.TimeColumn)
-			if t.Error != nil {
-				continue
-			}
-			var tim time.Time
-			tim, t.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(string), time.Local)	// @TODO - May have to revisit this!
-			if t.Error != nil {
-				continue
-			}
-			times = append(times, tim)
-
-			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.ValueColumn})
-			cell, t.Error = t.GetCell(row, *req.ValueColumn)
-			if t.Error != nil {
-				continue
-			}
-			var val float64
-			val, t.Error = strconv.ParseFloat(cell.(string), 64)
-			if t.Error != nil {
-				val = 0
-			}
-			values = append(values, val)
-		}
-
-		t.Error = t.graph.SetFilename(fmt.Sprintf("%s-%s.png", t.filePrefix, strings.ReplaceAll(t.graph.searchName, " ", "")))
-		if t.Error != nil {
-			break
-		}
-
-		t.Error = t.graph.SetX("Date", times...)
-		if t.Error != nil {
-			break
-		}
-
-		t.Error = t.graph.SetY(units, values...)
-		if t.Error != nil {
-			break
-		}
-	}
-
+	t.Error = t.graph.ProcessGraphData(t)
 	return t.Error
+
+	// for range Only.Once {
+	// 	req := t.graph.req
+	//
+	// 	t.graph.searchName = ""
+	// 	var units string
+	// 	var times []time.Time
+	// 	var values []float64
+	//
+	// 	if t.graph.req.DataUnit != nil {
+	// 		units = *t.graph.req.DataUnit
+	// 	}
+	//
+	// 	for row := 0; row < t.RowLength(); row++ {
+	// 		var cell interface{}
+	//
+	// 		// Get the search column
+	// 		// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.SearchColumn})
+	// 		// cell, t.Error = t.GetCell(row, *req.DataColumn)
+	// 		// if t.Error != nil {
+	// 		// 	continue
+	// 		// }
+	// 		// if !strings.Contains(cell.String(), *req.SearchString) {
+	// 		// 	continue
+	// 		// }
+	//
+	//
+	// 		if req.Title == "" {
+	// 			req.Title = cell.(string)
+	// 			t.SetTitle(cell.(string))
+	// 		}
+	//
+	//
+	// 		// if t.graph.searchName == "" {
+	// 			if req.NameColumn != nil {
+	// 				// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.NameColumn})
+	// 				cell, t.Error = t.GetCell(row, *req.NameColumn)
+	// 				if t.Error != nil {
+	// 					continue
+	// 				}
+	// 				t.graph.searchName = cell.(string)
+	// 			}
+	// 		// }
+	//
+	//
+	// 		// Get units
+	// 		if units == "" {
+	// 			if req.UnitsColumn != nil {
+	// 				// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.UnitsColumn})
+	// 				cell, t.Error = t.GetCell(row, *req.UnitsColumn)
+	// 				if t.Error != nil {
+	// 					continue
+	// 				}
+	// 				units = cell.(string)
+	// 			}
+	// 		}
+	//
+	//
+	// 		// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.TimeColumn})
+	// 		cell, t.Error = t.GetCell(row, *req.TimeColumn)
+	// 		if t.Error != nil {
+	// 			continue
+	// 		}
+	// 		var tim time.Time
+	// 		tim, t.Error = time.ParseInLocation(DateTimeSearchLayout, cell.(string), time.Local)	// @TODO - May have to revisit this!
+	// 		if t.Error != nil {
+	// 			continue
+	// 		}
+	// 		times = append(times, tim)
+	//
+	//
+	// 		// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.ValueColumn})
+	// 		cell, t.Error = t.GetCell(row, *req.DataColumn)
+	// 		if t.Error != nil {
+	// 			continue
+	// 		}
+	// 		var val float64
+	// 		val, t.Error = strconv.ParseFloat(cell.(string), 64)
+	// 		if t.Error != nil {
+	// 			val = 0
+	// 		}
+	// 		values = append(values, val)
+	// 	}
+	//
+	// 	var filename string
+	// 	// filename = fmt.Sprintf("%s-%s.png", t.filePrefix, strings.ReplaceAll(t.graph.searchName, " ", ""))
+	// 	filename = fmt.Sprintf("%s.png", t.filePrefix)
+	// 	t.Error = t.graph.SetFilename(filename)
+	// 	if t.Error != nil {
+	// 		break
+	// 	}
+	//
+	// 	t.Error = t.graph.SetX("Date", times...)
+	// 	if t.Error != nil {
+	// 		break
+	// 	}
+	//
+	// 	t.Error = t.graph.SetY(units, values...)
+	// 	if t.Error != nil {
+	// 		break
+	// 	}
+	// }
+	// return t.Error
 }
 
-type SearchStrings map[string]int
-func (t *Table) FindSearchStrings() error {
-	for range Only.Once {
-		fmt.Println("This is currently broken!")
-		break
-		t.graph.otherSearch = make(SearchStrings)
-
-		for row := 0; row < t.RowLength(); row++ {
-			// Get the search column
-			var cell interface{}
-			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *t.graph.req.SearchColumn})
-			cell, t.Error = t.GetCell(row, *t.graph.req.SearchColumn)
-			if t.Error != nil {
-				continue
-			}
-			if _, ok := t.graph.otherSearch[cell.(string)]; ok {
-				t.graph.otherSearch[cell.(string)] += 1
-			} else {
-				t.graph.otherSearch[cell.(string)] = 0
-			}
-		}
-	}
-
-	return t.Error
-}
-
-func (t *Table) SearchStrings() SearchStrings {
-	return t.graph.otherSearch
-}
+// type SearchStrings map[string]int
+// func (t *Table) FindSearchStrings() error {
+// 	for range Only.Once {
+// 		t.graph.otherSearch = make(SearchStrings)
+//
+// 		for row := 0; row < t.RowLength(); row++ {
+// 			// Get the search column
+// 			var cell interface{}
+// 			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *t.graph.req.SearchColumn})
+// 			cell, t.Error = t.GetCell(row, *t.graph.req.SearchColumn)
+// 			if t.Error != nil {
+// 				continue
+// 			}
+// 			if _, ok := t.graph.otherSearch[cell.(string)]; ok {
+// 				t.graph.otherSearch[cell.(string)] += 1
+// 			} else {
+// 				t.graph.otherSearch[cell.(string)] = 0
+// 			}
+// 		}
+// 	}
+//
+// 	return t.Error
+// }
+//
+// func (t *Table) SearchStrings() SearchStrings {
+// 	return t.graph.otherSearch
+// }
 
 func (t *Table) CreateGraph() error {
 	for range Only.Once {
-		if *t.graph.req.SearchString != "" {
-			t.Error = t.graph.Generate()
-			break
-		}
-
-		t.Error = t.FindSearchStrings()
+		t.Error = t.SetGraphFromJson(Json(t.graphFilter))
 		if t.Error != nil {
 			break
 		}
 
-		for s := range t.graph.otherSearch {
-			t.graph.req.SearchString = &s
-			t.Error = t.ProcessGraphData()
-			if t.Error != nil {
-				continue
-			}
-			t.Error = t.graph.Generate()
-			if t.Error != nil {
-				continue
-			}
-		}
+		t.Error = t.graph.Generate()
+
+		// if t.graph.req.SearchString == nil {
+		// 	break
+		// }
+		// if *t.graph.req.SearchString != "" {
+		// 	t.Error = t.graph.Generate()
+		// 	break
+		// }
+		//
+		// t.Error = t.FindSearchStrings()
+		// if t.Error != nil {
+		// 	break
+		// }
+		//
+		// for s := range t.graph.otherSearch {
+		// 	t.graph.req.SearchString = &s
+		// 	t.Error = t.ProcessGraphData()
+		// 	if t.Error != nil {
+		// 		continue
+		// 	}
+		// 	t.Error = t.graph.Generate()
+		// 	if t.Error != nil {
+		// 		continue
+		// 	}
+		// }
 	}
 
 	return t.Error
@@ -287,13 +319,17 @@ func (t *Table) CreateGraph() error {
 type Chart struct {
 	Error error `json:"-"`
 
-	searchName string
-	otherSearch SearchStrings
-	req GraphRequest
-	filename string
+	// otherSearch SearchStrings
+	searchName  string
+	title       string
+	req         GraphRequest
+	filename    string
 	timeSeries1 chart.TimeSeries
 	timeSeries2 chart.TimeSeries
-	graph chart.Chart
+	annotation  chart.AnnotationSeries
+	minSeries   *chart.MinSeries
+	maxSeries   *chart.MaxSeries
+	graph       chart.Chart
 }
 
 
@@ -333,7 +369,7 @@ type Chart struct {
 // }
 
 
-func New(title string) *Chart {
+func New() *Chart {
 	var c Chart
 
 	for range Only.Once {
@@ -344,7 +380,7 @@ func New(title string) *Chart {
 			XValues: []time.Time{},
 			YValues: []float64{},
 		}
-		c.timeSeries2 = chart.TimeSeries{
+		c.timeSeries2 = chart.TimeSeries {
 			Name:    "",
 			Style:   chart.Style{},
 			YAxis:   chart.YAxisSecondary,
@@ -352,20 +388,33 @@ func New(title string) *Chart {
 			YValues: []float64{},
 		}
 
+		c.annotation = chart.AnnotationSeries {
+			Annotations: []chart.Value2 {
+			},
+		}
+
 		c.graph = chart.Chart {
-			Title:          title,
+			Title:          "",
 			TitleStyle:     chart.Style{},
 			ColorPalette:   nil,
 			Width:          0,
 			Height:         0,
 			DPI:            0,
-			Background:     chart.Style{},
+			Background: chart.Style {
+				Padding: chart.Box {
+					Top:    50,
+					Left:   25,
+					Right:  25,
+					Bottom: 10,
+				},
+				FillColor: drawing.ColorFromHex("efefef"),
+			},
 			Canvas:         chart.Style{},
 			XAxis:          chart.XAxis{},
 			YAxis:          chart.YAxis{},
 			YAxisSecondary: chart.YAxis{},
 			Font:           nil,
-			Series:         []chart.Series{c.timeSeries1},	// , c.timeSeries2},
+			Series:         []chart.Series{},	// c.timeSeries1, c.annotation },	// , c.timeSeries2},
 			Elements:       nil,
 			Log:            nil,
 		}
@@ -375,6 +424,208 @@ func New(title string) *Chart {
 }
 
 
+func (c *Chart) ProcessGraphData(table *Table) error {
+	for range Only.Once {
+		// req := c.req
+
+		c.searchName = ""
+		// var units string
+		var times []time.Time
+		var values []float64
+
+		// if c.req.DataUnit != nil {
+		// 	units = *c.req.DataUnit
+		// }
+		for row := 0; row < table.RowLength(); row++ {
+			var cell interface{}
+			var cellType string
+
+			// Get the search column
+			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.SearchColumn})
+			// cell, t.Error = t.GetCell(row, *req.DataColumn)
+			// if t.Error != nil {
+			// 	continue
+			// }
+			// if !strings.Contains(cell.String(), *req.SearchString) {
+			// 	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})
+				cellType, cell, c.Error = table.GetCell(row, *c.req.NameColumn)
+				if c.Error != nil {
+					continue
+				}
+				val, isNil, ok := valueTypes.AnyToUnitValue(cell, "", *c.req.DataUnit, "", "")
+				if isNil {
+					continue
+				}
+				if !ok {
+					continue
+				}
+				units := val.String()
+				c.req.NameColumn = &units
+
+				// switch cellType {
+				// 	case "string":
+				// 		c.searchName = cell.(string)
+				// 	case valueTypes.TypeUnitValue:
+				// 		c.searchName = cell.(valueTypes.UnitValue).String()
+				// 	default:
+				// 		c.searchName = fmt.Sprintf("%s", cell)
+				// }
+			}
+			// }
+
+
+			// Get units
+			if c.req.DataUnit == nil {
+				if c.req.UnitsColumn != nil {
+					// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.UnitsColumn})
+					cellType, cell, c.Error = table.GetCell(row, *c.req.UnitsColumn)
+					if c.Error != nil {
+						continue
+					}
+					val, isNil, ok := valueTypes.AnyToUnitValue(cell, "", *c.req.DataUnit, "", "")
+					if isNil {
+						continue
+					}
+					if !ok {
+						continue
+					}
+					units := val.String()
+					c.req.DataUnit = &units
+
+					// switch cellType {
+					// 	case "string":
+					// 		units := cell.(string)
+					// 		c.req.DataUnit = &units
+					// 	case valueTypes.TypeUnitValue:
+					// 		units := cell.(valueTypes.UnitValue).String()
+					// 		c.req.DataUnit = &units
+					// 	default:
+					// 		units := fmt.Sprintf("%s", cell)
+					// 		c.req.DataUnit = &units
+					// }
+				}
+			}
+
+
+			// 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 {
+				continue
+			}
+			// val, isNil, ok := valueTypes.AnyToUnitValue(cell, "", *c.req.DataUnit, "", "")
+			// if isNil {
+			// 	continue
+			// }
+			// if !ok {
+			// 	continue
+			// }
+			// if !val.First().IsTypeDateTime() {
+			// 	continue
+			// }
+			// 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)
+			}
+
+			// cell, t.Error = t.table.CellAt(tabular.CellLocation{Row: row, Column: *req.ValueColumn})
+			cellType, cell, c.Error = table.GetCell(row, *c.req.DataColumn)
+			if c.Error != nil {
+				continue
+			}
+			u := ""
+			if c.req.DataUnit != nil {
+				u = *c.req.DataUnit
+			}
+			val, isNil, ok := valueTypes.AnyToUnitValue(cell, "", u, "", "")
+			if isNil {
+				continue
+			}
+			if !ok {
+				continue
+			}
+			values = append(values, val.First().Value())
+
+			// switch cellType {
+			// 	case "string":
+			// 		var val float64
+			// 		val, c.Error = strconv.ParseFloat(cell.(string), 64)
+			// 		if c.Error != nil {
+			// 			val = 0
+			// 		}
+			// 		values = append(values, val)
+			// 	case "float32":
+			// 		values = append(values, float64(cell.(float32)))
+			// 	case "float64":
+			// 		values = append(values, cell.(float64))
+			// 	case valueTypes.TypeUnitValue:
+			// 		units := cell.(valueTypes.UnitValue).String()
+			// 		c.req.DataUnit = &units
+			// 	default:
+			// 		units := fmt.Sprintf("%s", cell)
+			// 		c.req.DataUnit = &units
+			// }
+		}
+
+		var filename string
+		// filename = fmt.Sprintf("%s-%s.png", t.filePrefix, strings.ReplaceAll(t.graph.searchName, " ", ""))
+		filename = fmt.Sprintf("%s.png", table.filePrefix)
+		c.Error = c.SetFilename(filename)
+		if c.Error != nil {
+			break
+		}
+
+		c.Error = c.SetX("Date", times...)
+		if c.Error != nil {
+			break
+		}
+
+		var unit string
+		if c.req.DataUnit != nil {
+			unit = *c.req.DataUnit
+		}
+		c.Error = c.SetY(unit, values...)
+		if c.Error != nil {
+			break
+		}
+	}
+
+	return c.Error
+}
+
 func (c *Chart) SetWidth(v *int) {
 	for range Only.Once {
 		if v == nil {
@@ -417,21 +668,23 @@ func (c *Chart) SetFilename(fn string) error {
 	return c.Error
 }
 
-func (c *Chart) SetTitle(fn string) error {
-	c.graph.Title = fn
-	c.req.Title = fn
+func (c *Chart) SetTitle(title string) error {
+	c.graph.Title = title
+	// c.req.Title = title
 	return c.Error
 }
 
+// var zero = float64(0)
+
 func (c *Chart) SetRangeY(min *float64, max *float64) bool {
 	var changed bool
 	for range Only.Once {
 		if min == nil {
-			min = c.req.MinLeftAxis
+			min = c.req.DataMin
 		}
 
 		if max == nil {
-			max = c.req.MaxLeftAxis
+			max = c.req.DataMax
 		}
 
 		c.graph.YAxis.Range = &chart.ContinuousRange {
@@ -447,21 +700,21 @@ func (c *Chart) SetRangeY(min *float64, max *float64) bool {
 	return changed
 }
 
-func (c *Chart) SetGraphSearch(req GraphRequest) bool {
+func (c *Chart) SetColumns(req GraphRequest) bool {
 	var changed bool
 	for range Only.Once {
-		if req.SearchString != nil {
-			c.req.SearchString = req.SearchString
-			changed = true
-		}
+		// if req.SearchString != nil {
+		// 	c.req.SearchString = req.SearchString
+		// 	changed = true
+		// }
 
 		if req.TimeColumn != nil {
 			c.req.TimeColumn = req.TimeColumn
 			changed = true
 		}
 
-		if req.ValueColumn != nil {
-			c.req.ValueColumn = req.ValueColumn
+		if req.DataColumn != nil {
+			c.req.DataColumn = req.DataColumn
 			changed = true
 		}
 
@@ -470,10 +723,10 @@ func (c *Chart) SetGraphSearch(req GraphRequest) bool {
 			changed = true
 		}
 
-		if req.SearchColumn != nil {
-			c.req.SearchColumn = req.SearchColumn
-			changed = true
-		}
+		// if req.DataColumn != nil {
+		// 	c.req.DataColumn = req.DataColumn
+		// 	changed = true
+		// }
 	}
 
 	return changed
@@ -561,18 +814,56 @@ func (c *Chart) SetY(name string, values ...float64) error {
 		// 	GridMinorStyle: chart.Style{},
 		// }
 
+		// var minX float64
+		// var maxX float64
+		var minY float64
+		var maxY float64
+		for _, value := range values {
+			if value > maxY {
+				maxY = value
+				// maxX = c.timeSeries1.XValues[index].
+				// maxX = 0.0
+			}
+			if value < minY {
+				minY = value
+				// minX = index
+				// minX = 50.0
+			}
+		}
+
+		if (c.req.DataMin == nil) && (c.req.DataMax == nil) {
+			rng := ((maxY - minY) / 2) * 1.1
+			nMin := minY - rng
+			if (nMin < 0.0) && (minY >= 0.0) {
+				// If the subtraction has sent us negative.
+				nMin = 0.0
+			}
+			nMax := maxY + rng
+			c.SetRangeY(&nMin, &nMax)
+		}
+
+		// c.annotation.Annotations = append(c.annotation.Annotations, chart.Value2 {
+		// 	Style:  chart.Style {
+		// 		StrokeColor: drawing.ColorGreen,
+		// 		FillColor:   drawing.ColorGreen.WithAlpha(64),
+		// 	},
+		// 	Label:  "Min " + strconv.FormatFloat(minY, 'f', -1, 64),
+		// 	XValue: minX,
+		// 	YValue: minY,
+		// })
+		//
+		// c.annotation.Annotations = append(c.annotation.Annotations, chart.Value2 {
+		// 	Style:  chart.Style {
+		// 		StrokeColor: drawing.ColorGreen,
+		// 		FillColor:   drawing.ColorGreen.WithAlpha(64),
+		// 	},
+		// 	Label:  "Max " + strconv.FormatFloat(maxY, 'f', -1, 64),
+		// 	XValue: maxX,
+		// 	YValue: maxY,
+		// })
+
 		c.graph.YAxis.Name = name
-
 		c.timeSeries1.YValues = values
-		// c.timeSeries1.YValues = append(c.timeSeries1.YValues, values...)
-
-		// c.graph.Series = []chart.Series{ c.timeSeries }
-		// c.graph.YAxis.Range = &chart.ContinuousRange {
-		// 	Min:        0,
-		// 	Max:        0,
-		// 	Domain:     0,
-		// 	Descending: false,
-		// }
 	}
 	return c.Error
 }
@@ -633,19 +924,54 @@ func (c *Chart) Generate() error {
 			FillColor:   drawing.ColorBlue.WithAlpha(64),
 		}
 
+		c.minSeries = &chart.MinSeries {
+			Name: "Min",
+			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,
+			},
+			InnerSeries: c.timeSeries1,
+		}
+
+		c.maxSeries = &chart.MaxSeries {
+			Name: "Max",
+			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,
+			},
+			InnerSeries: c.timeSeries1,
+		}
+
 		c.graph.Series = []chart.Series {
 			c.timeSeries1,
+			// c.annotation,
+			c.minSeries,
+			c.maxSeries,
+			chart.LastValueAnnotationSeries(c.minSeries),
+			chart.LastValueAnnotationSeries(c.maxSeries),
 			// c.timeSeries2,
 		}
 
 		c.graph.DPI = 150
+		c.graph.Elements = []chart.Renderable{chart.Legend(&c.graph)}
 
 		for range Only.Once {
 			if c.req.Title != "" {
 				c.graph.Title = c.req.Title
 				break
 			}
-			c.graph.Title = c.searchName
+			if c.title != "" {
+				c.graph.Title = c.title
+				break
+			}
 		}
 
 		fmt.Printf("Creating graph file '%s'\n", c.filename)
diff --git a/iSolarCloud/api/GoStruct/output/struct_json.go b/iSolarCloud/api/GoStruct/output/struct_json.go
index 7844fd46c..743b6b00a 100644
--- a/iSolarCloud/api/GoStruct/output/struct_json.go
+++ b/iSolarCloud/api/GoStruct/output/struct_json.go
@@ -1,12 +1,13 @@
 package output
 
 import (
-	"github.com/MickMake/GoUnify/Only"
 	"GoSungrow/iSolarCloud/api/GoStruct/reflection"
 	"encoding/json"
 	"fmt"
+	"github.com/MickMake/GoUnify/Only"
 )
 
+
 type Json string
 
 
diff --git a/iSolarCloud/api/GoStruct/output/struct_table.go b/iSolarCloud/api/GoStruct/output/struct_table.go
index d033ab238..d0772a853 100644
--- a/iSolarCloud/api/GoStruct/output/struct_table.go
+++ b/iSolarCloud/api/GoStruct/output/struct_table.go
@@ -7,6 +7,7 @@ import (
 	"github.com/MickMake/GoUnify/Only"
 	tabular "github.com/agrison/go-tablib"
 	"os"
+	"reflect"
 	"sort"
 	"strings"
 )
@@ -132,8 +133,9 @@ func (t *Table) RowLength() int {
 	return t.table.Height()
 }
 
-func (t *Table) GetCell(row int, colName string) (interface{}, error) {
+func (t *Table) GetCell(row int, colName string) (string, interface{}, error) {
 	var ret interface{}
+	var retType string
 	for range Only.Once {
 		var r map[string]interface{}
 		r, t.Error = t.table.Row(row)
@@ -141,8 +143,10 @@ func (t *Table) GetCell(row int, colName string) (interface{}, error) {
 			break
 		}
 		ret = r[colName]
+		// retType = reflect.TypeOf(ret).String()
+		retType = reflect.TypeOf(ret).Name()
 	}
-	return ret, t.Error
+	return retType, ret, t.Error
 }
 
 func (t *Table) AddRow(row ...interface{}) error {
@@ -167,6 +171,10 @@ func (t *Table) SetTitle(title string, args ...interface{}) {
 	t.title = fmt.Sprintf(title, args...)
 }
 
+func (t *Table) AppendTitle(title string, args ...interface{}) {
+	t.title += fmt.Sprintf(title, args...)
+}
+
 func (t *Table) GetTitle() string {
 	return t.title
 }
@@ -237,6 +245,7 @@ func (t *Table) GetName() string {
 	return t.name
 }
 
+
 func (t *Table) Output() error {
 	for range Only.Once {
 		if t == nil {
@@ -268,14 +277,7 @@ func (t *Table) Output() error {
 				t.Error = t.WriteJson()
 
 			case t.OutputType.IsGraph():
-				t.Error = t.SetGraphFromJson(Json(t.graphFilter))
-				if t.Error != nil {
-					break
-				}
 				t.Error = t.CreateGraph()
-				if t.Error != nil {
-					break
-				}
 
 			case t.OutputType.IsStruct():
 				t.Error = t.WriteStruct()
@@ -287,23 +289,29 @@ func (t *Table) Output() error {
 	return t.Error
 }
 
-
-func (t *Table) GetTable() string {
+func (t *Table) AsTable() string {
 	return t.String()
 }
 
 func (t *Table) WriteTable() error {
 	for range Only.Once {
 		if t.IsNotValid() {
+			msg := fmt.Sprintf("# %s - has no data.", t.name)
+			if t.saveAsFile {
+				fmt.Println(msg)
+			} else {
+				_, _ = fmt.Fprintln(os.Stderr, msg)
+			}
 			break
 		}
 
+		fmt.Printf("# %s\n", t.title)
 		if t.saveAsFile {
 			t.filePrefix += "." + StringTypeTable
 			t.Error = t.writeFile(t.String(), DefaultFileMode)
 			break
 		}
-		fmt.Printf("# %s\n", t.title)
+
 		fmt.Print(t.String())
 	}
 	return t.Error
@@ -312,22 +320,29 @@ func (t *Table) WriteTable() error {
 func (t *Table) WriteList() error {
 	for range Only.Once {
 		if t.IsNotValid() {
+			msg := fmt.Sprintf("# %s - has no data.", t.name)
+			if t.saveAsFile {
+				fmt.Println(msg)
+			} else {
+				_, _ = fmt.Fprintln(os.Stderr, msg)
+			}
 			break
 		}
 
+		fmt.Printf("# %s\n", t.title)
 		if t.saveAsFile {
 			t.filePrefix += "." + StringTypeList
 			t.Error = t.writeFile(t.String(), DefaultFileMode)
 			break
 		}
-		fmt.Printf("# %s\n", t.title)
+
 		fmt.Print(t.String())
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetCsv() string {
+func (t *Table) AsCsv() string {
 	var ret string
 	for range Only.Once {
 		if t.IsNotValid() {
@@ -347,21 +362,29 @@ func (t *Table) GetCsv() string {
 func (t *Table) WriteCsv() error {
 	for range Only.Once {
 		if t.IsNotValid() {
+			msg := fmt.Sprintf("# %s - has no data.", t.name)
+			if t.saveAsFile {
+				fmt.Println(msg)
+			} else {
+				_, _ = fmt.Fprintln(os.Stderr, msg)
+			}
 			break
 		}
 
 		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += "." + StringTypeCsv
-			t.Error = t.writeFile(t.GetCsv(), DefaultFileMode)
+			t.Error = t.writeFile(t.AsCsv(), DefaultFileMode)
 			break
 		}
-		fmt.Print(t.GetCsv())
+
+		fmt.Print(t.AsCsv())
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetXml() string {
+func (t *Table) AsXml() string {
 	var ret string
 	for range Only.Once {
 		if t.IsNotValid() {
@@ -381,21 +404,29 @@ func (t *Table) GetXml() string {
 func (t *Table) WriteXml() error {
 	for range Only.Once {
 		if t.IsNotValid() {
+			msg := fmt.Sprintf("# %s - has no data.", t.name)
+			if t.saveAsFile {
+				fmt.Println(msg)
+			} else {
+				_, _ = fmt.Fprintln(os.Stderr, msg)
+			}
 			break
 		}
 
 		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += "." + StringTypeXML
-			t.Error = t.writeFile(t.GetXml(), DefaultFileMode)
+			t.Error = t.writeFile(t.AsXml(), DefaultFileMode)
 			break
 		}
-		fmt.Print(t.GetXml())
+
+		fmt.Print(t.AsXml())
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetXLSX() string {
+func (t *Table) AsXLSX() string {
 	var ret string
 	for range Only.Once {
 		if t.IsNotValid() {
@@ -415,75 +446,81 @@ func (t *Table) GetXLSX() string {
 func (t *Table) WriteXLSX() error {
 	for range Only.Once {
 		if t.IsNotValid() {
+			msg := fmt.Sprintf("# %s - has no data.", t.name)
+			if t.saveAsFile {
+				fmt.Println(msg)
+			} else {
+				_, _ = fmt.Fprintln(os.Stderr, msg)
+			}
 			break
 		}
 
-		// if t.saveAsFile {
+		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += "." + StringTypeXLSX
-			t.Error = t.writeFile(t.GetXLSX(), DefaultFileMode)
-		// 	break
-		// }
-		// fmt.Print(t.GetXml())
+			t.Error = t.writeFile(t.AsXLSX(), DefaultFileMode)
+			break
+		}
+
+		fmt.Print(t.AsXLSX())
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetJson() string {
+func (t *Table) AsJson() string {
 	return string(t.raw)
 }
 
 func (t *Table) WriteJson() error {
 	for range Only.Once {
-		if t.IsNotValid() {
-			break
-		}
+		// Don't check for valid table data.
 
 		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += "." + StringTypeJson
 			t.Error = t.writeFile(string(t.json), DefaultFileMode)
 			break
 		}
+
 		fmt.Printf("%s", t.json)
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetRaw() string {
+func (t *Table) AsRaw() string {
 	return string(t.json)
 }
 
-func (t *Table) GetRawBytes() []byte {
+func (t *Table) AsRawBytes() []byte {
 	return t.json
 }
 
 func (t *Table) WriteRaw() error {
 	for range Only.Once {
-		// if t.IsNotValid() {
-		// 	break
-		// }
+		// Don't check for valid table data.
 
 		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += "." + StringTypeRaw
 			t.Error = t.writeFile(string(t.raw), DefaultFileMode)
 			break
 		}
+
 		fmt.Printf("%s", t.raw)
 	}
 	return t.Error
 }
 
 
-func (t *Table) GetStruct() string {
+func (t *Table) AsStruct() string {
 	return string(t.json)
 }
 
 func (t *Table) WriteStruct() error {
 	for range Only.Once {
-		// if t.IsNotValid() {
-		// 	break
-		// }
+		// Don't check for valid table data.
 
 		var data string
 		var options gojson.Options
@@ -501,10 +538,12 @@ func (t *Table) WriteStruct() error {
 		}
 
 		if t.saveAsFile {
+			fmt.Printf("# %s\n", t.title)
 			t.filePrefix += ".go"
 			t.Error = t.writeFile(data, DefaultFileMode)
 			break
 		}
+
 		fmt.Printf("%s", data)
 	}
 	return t.Error
diff --git a/iSolarCloud/api/GoStruct/output/struct_tables.go b/iSolarCloud/api/GoStruct/output/struct_tables.go
new file mode 100644
index 000000000..493c18b6b
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/output/struct_tables.go
@@ -0,0 +1,364 @@
+package output
+
+
+// type StructTable struct {
+// 	Name       string
+// 	Current    *Reflect
+// 	Reflects   ReflectArray
+// 	SortOn     string
+// 	ShowIndex  bool
+// 	IndexTitle string
+// 	IsValid    bool
+// 	Columns    []string
+// 	Rows       int
+// 	Cols       int
+// 	ActualRows int
+// 	ActualCols int
+// }
+//
+//
+// type ReflectArray []ReflectArrayRow
+// type ReflectArrayRow []*Reflect
+//
+// func (ta *ReflectArray) AddRow(refs ...*Reflect) ReflectArray {
+// 	for range Only.Once {
+// 		if ta == nil {
+// 			*ta = make(ReflectArray, 0)
+// 		}
+//
+// 		var row ReflectArrayRow
+// 		row = append(row, refs...)
+// 		*ta = append(*ta, row)
+// 	}
+// 	return *ta
+// }
+//
+// func (ta *ReflectArray) GetRow(row int) ReflectArrayRow {
+// 	if row >= len(*ta) {
+// 		return ReflectArrayRow{}
+// 	}
+// 	return (*ta)[row]
+// }
+//
+//
+// type StructTables []StructTable
+// type StructValuesMap map[string]StructValues
+// type StructValues []StructValue
+// type StructValue map[string]valueTypes.UnitValue
+//
+// func (ta *StructValues) GetCell(row int, col string) valueTypes.UnitValue {
+// 	var ret valueTypes.UnitValue
+// 	for range Only.Once {
+// 		if row >= len(*ta) {
+// 			ret = valueTypes.SetUnitValueString("error", "error", "row > size")
+// 			break
+// 		}
+//
+// 		if _, ok := (*ta)[row][col]; !ok {
+// 			ret = valueTypes.SetUnitValueString("", "", "")
+// 			break
+// 		}
+//
+// 		ret = (*ta)[row][col]
+// 	}
+// 	return ret
+// }
+//
+// func (ta *StructTable) AddRow(refs ...*Reflect) {
+// 	for range Only.Once {
+// 		if ta.Reflects == nil {
+// 			ta.Reflects = make(ReflectArray, 0)
+// 		}
+//
+// 		// var row ReflectArrayRow
+// 		// row = append(row, refs...)
+// 		ta.Reflects = append(ta.Reflects, append(ReflectArrayRow{}, refs...))
+// 	}
+// }
+//
+// func (ta *StructTable) GetRow(row int) ReflectArrayRow {
+// 	return ta.Reflects.GetRow(row)
+// }
+//
+// func (ta *StructTable) GetHeaders() []string {
+// 	return ta.Columns
+// }
+//
+// func (ta *StructTable) Get() ReflectArray {
+// 	return ta.Reflects
+// }
+//
+// func (ta *StructTable) GetValues() StructValues {
+// 	ret := make(StructValues, 0)
+//
+// 	for range Only.Once {
+// 		if !ta.IsValid {
+// 			break
+// 		}
+//
+// 		colOrder := make(map[string]int)
+// 		var colOrderIndex int
+//
+// 		var addCol = func(name string) {
+// 			if _, ok := colOrder[name]; !ok {
+// 				colOrder[name] = colOrderIndex
+// 				colOrderIndex++
+// 			}
+// 		}
+//
+// 		var colName = func(sub *Reflect, value *valueTypes.UnitValue, length int) string {
+// 			name := sub.DataStructure.PointName
+// 			if value.ValueKey() == "" {
+// 				if name == "" {
+// 					name = "Column " + strconv.Itoa(length)
+// 				}
+// 			} else {
+// 				name += " " + value.ValueKey()
+// 			}
+// 			switch value.Unit() {
+// 			case "--":
+// 			case "":
+// 			default:
+// 				if !sub.DataStructure.PointVariableUnit {
+// 					name += " (" + value.Unit() + ")"
+// 				}
+// 			}
+// 			return name
+// 		}
+//
+// 		// ta.Reflects - contains the rows.
+// 		// ta.Reflects == 0 - something wrong.
+// 		// ta.Reflects == 1 - Single row, .
+//
+// 		if len(ta.Reflects) == 0 {
+// 			// fmt.Println("len(ta.Reflects) == 0")
+// 			// Probs an array of values.
+// 			// cm := make(map[string][]valueTypes.UnitValue)
+// 			// var length int
+// 			//
+// 			// if ta.ShowIndex {
+// 			// 	addCol(ta.IndexTitle)
+// 			// }
+// 			// for _, sub := range ta.Current.Value.Range(true) {
+// 			// 	name := sub.ValueKey()
+// 			// 	if !ta.Current.IsPointVariableUnit() {
+// 			// 		switch sub.Unit() {
+// 			// 			case "--":
+// 			// 			case "":
+// 			// 			default:
+// 			// 				name += " (" + sub.Unit() + ")"
+// 			// 		}
+// 			// 		addCol(name)
+// 			// 	}
+// 			//
+// 			// 	cm[name] = sub.Range(valueTypes.SortOrder)
+// 			// 	l := sub.Value.Length()
+// 			// 	if l > length {
+// 			// 		length = l
+// 			// 	}
+// 			// }
+// 			//
+// 			// for index := 0; index < length; index++ {
+// 			// 	data := make(StructValue)
+// 			//
+// 			// 	if ta.ShowIndex {
+// 			// 		vi := valueTypes.SetUnitValueInteger(int64(index), ta.IndexTitle, "")
+// 			// 		data[ta.IndexTitle] = vi
+// 			// 	}
+// 			//
+// 			// 	for name, value := range cm {
+// 			// 		if index >= len(value) {
+// 			// 			data[name] = valueTypes.UnitValue{}
+// 			// 		}
+// 			// 		data[name] = value[index]
+// 			// 	}
+// 			// 	ret = append(ret, data)
+// 			// }
+// 			//
+// 			// ta.Columns = sortMapByValues(colOrder)
+//
+// 			// cm := make(map[string][]valueTypes.UnitValue)
+// 			// cm[ta.Current.DataStructure.PointName] = ta.Current.Value.Range(valueTypes.SortOrder)
+// 			// length := ta.Current.Value.Length()
+// 			// addCol("Key")
+// 			// addCol("Value")
+// 			// // data := make(StructValue)
+// 			// // data["Key"] = value[name]
+// 			// // ret = append(ret, data)
+// 			// for index := 0; index < length; index++ {
+// 			// 	data := make(StructValue)
+// 			//
+// 			// 	if ta.ShowIndex {
+// 			// 		vi := valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
+// 			// 		data[ta.IndexTitle] = vi
+// 			// 	}
+// 			//
+// 			// 	for name, value := range cm {
+// 			// 		data[name] = value[index]
+// 			// 	}
+// 			// 	ret = append(ret, data)
+// 			// }
+// 			break
+// 		}
+//
+//
+// 		if len(ta.Reflects) == 1 {
+// 			// Probs an array of values - sw we want to pivot the data.
+// 			cm := make(map[string][]valueTypes.UnitValue)
+// 			var length int
+//
+// 			if ta.ShowIndex {
+// 				addCol(ta.IndexTitle)
+// 			}
+// 			for _, sub := range ta.Reflects[0] {
+// 				name := sub.DataStructure.PointName
+// 				if !sub.DataStructure.PointVariableUnit {
+// 					switch sub.Value.GetUnit() {
+// 					case "--":
+// 					case "":
+// 					default:
+// 						name += " (" + sub.Value.GetUnit() + ")"
+// 					}
+// 					addCol(name)
+// 				} else {
+// 					// addCol(name)
+// 					// addCol("Units")
+// 					// cm[name] = sub.Value.Range(valueTypes.SortOrder)
+// 				}
+//
+// 				cm[name] = sub.Value.Range(valueTypes.SortOrder)
+// 				l := sub.Value.Length()
+// 				if l > length {
+// 					length = l
+// 				}
+// 			}
+//
+// 			tin := ta.Current.GetDataTableIndexNames()
+// 			for index := 0; index < length; index++ {
+// 				data := make(StructValue)
+//
+// 				if ta.ShowIndex {
+// 					var vi valueTypes.UnitValue
+// 					if len(tin) > 0 {
+// 						vi = valueTypes.SetUnitValueString(ta.IndexTitle, "", tin[index])
+// 					} else {
+// 						vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
+// 					}
+// 					data[ta.IndexTitle] = vi
+// 				}
+//
+// 				for name, value := range cm {
+// 					if index >= len(value) {
+// 						data[name] = valueTypes.UnitValue{}
+// 						continue
+// 						// @TODO - potential issue here.
+// 					}
+// 					data[name] = value[index]
+// 				}
+// 				ret = append(ret, data)
+// 			}
+//
+// 			ta.Columns = sortMapByValues(colOrder)
+// 			break
+// 		}
+//
+//
+// 		if ta.ShowIndex {
+// 			addCol(ta.IndexTitle)
+// 		}
+//
+// 		for rowIndex, _ := range ta.Reflects {
+// 			// fmt.Printf("ROW[%d] - size:%d\n", rowIndex, len(ta.Reflects[rowIndex]))
+// 			data := make(StructValue)
+// 			// fmt.Printf("DEBUG[0].FieldPath == %s\n", row[0].FieldPath.String())
+//
+// 			// size := len(ta.Reflects[rowIndex])
+// 			// if size == 1 {
+// 			// 	Current := ta.Reflects[rowIndex][0]
+// 			// 	for _, value := range Current.Value {
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Date"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Point Id"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Value"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: value.Unit()})	// "Unit"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: value.TypeValue})	// "Unit Type"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Group Name"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Description"
+// 			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Update Freq"
+// 			// 		ret = append(ret, data)
+// 			// 	}
+// 			// 	continue
+// 			// }
+//
+// 			if ta.ShowIndex {
+// 				var vi valueTypes.UnitValue
+// 				vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(rowIndex))
+// 				data[ta.IndexTitle] = vi
+// 			}
+//
+// 			for colIndex, col := range ta.Reflects[rowIndex] {
+// 				// It's important that the values are sorted by table header.
+// 				// This is so that the headers match with data.
+// 				if len(col.ChildReflect) > 0 {
+// 					// Handles
+// 					for _, sub := range col.ChildReflect {
+// 						for _, val := range sub.Value.Range(valueTypes.SortOrder) {
+// 							name := colName(sub, &val, len(data))
+// 							data[name] = val
+// 							addCol(name)
+// 						}
+// 					}
+// 					continue
+// 				}
+//
+// 				if col.IsKnown() {
+// 					value := ta.Reflects[rowIndex][colIndex].Value
+// 					// data = append(data, value.Range(valueTypes.SortOrder)...)
+// 					for _, val := range value.Range(valueTypes.SortOrder) {
+// 						name := colName(col, &val, len(data))
+// 						data[name] = val
+// 						addCol(name)
+// 					}
+// 					continue
+// 				}
+//
+// 				dateFormat := col.DataStructure.PointNameDateFormat
+// 				if dateFormat == "" {
+// 					dateFormat = valueTypes.DateTimeLayout
+// 				}
+// 				value, _, _ := valueTypes.AnyToUnitValue(col.Value, "", col.DataStructure.PointUnit,
+// 					col.DataStructure.PointValueType, dateFormat)
+//
+// 				// data = append(data, value.Range(valueTypes.SortOrder)...)
+// 				for _, val := range value.Range(valueTypes.SortOrder) {
+// 					name := colName(col, &val, len(data))
+// 					data[name] = val
+// 					addCol(name)
+// 				}
+// 			}
+// 			ret = append(ret, data)
+// 		}
+//
+// 		ta.Columns = sortMapByValues(colOrder)
+//
+// 		// @TODO - Add sorting capability here.
+// 	}
+//
+// 	return ret
+// }
+//
+// func sortMapByValues(data map[string]int) []string {
+// 	var ret []string
+// 	keys := make([]string, 0, len(data))
+//
+// 	for key := range data {
+// 		keys = append(keys, key)
+// 	}
+// 	sort.SliceStable(keys, func(i, j int) bool{
+// 		return data[keys[i]] < data[keys[j]]
+// 	})
+//
+// 	for _, k := range keys{
+// 		ret = append(ret, k)
+// 	}
+// 	return ret
+// }
diff --git a/iSolarCloud/api/GoStruct/struct_table.go b/iSolarCloud/api/GoStruct/struct_table.go
new file mode 100644
index 000000000..ec2574e30
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/struct_table.go
@@ -0,0 +1,622 @@
+package GoStruct
+
+import (
+	"GoSungrow/iSolarCloud/api/GoStruct/output"
+	"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
+	"errors"
+	"fmt"
+	"github.com/MickMake/GoUnify/Only"
+	"os"
+	"sort"
+	"strconv"
+)
+
+
+type StructTables map[string]*StructTable
+
+func (sm *StructTables) GetTableNames() []string {
+	var ret []string
+
+	for range Only.Once {
+		for name := range *sm {
+			ret = append(ret, name)
+		}
+	}
+
+	return ret
+}
+
+
+type StructTable struct {
+	Area       string
+	Name       string
+	Current    *Reflect
+
+	MapName    string
+	Reflects   ReflectArray
+	Values     StructValues
+	Table      output.Table
+	SortOn     string
+	ShowIndex  bool
+	IndexTitle string
+	IsValid    bool
+	Columns    []string
+	Rows       int
+	Cols       int
+	ActualRows int
+	ActualCols int
+
+	Debug      bool
+	Error      error
+}
+
+func (ta *StructTable) PrintDebug(format string, args ...interface{})  {
+	if ta.Debug { _, _ = fmt.Fprintf(os.Stderr, format, args...) }
+}
+
+func (ta *StructTable) AddRow(refs ...*Reflect) {
+	for range Only.Once {
+		if ta.Reflects == nil {
+			ta.Reflects = make(ReflectArray, 0)
+		}
+
+		// var row ReflectArrayRow
+		// row = append(row, refs...)
+		ta.Reflects = append(ta.Reflects, append(ReflectArrayRow{}, refs...))
+	}
+}
+
+func (ta *StructTable) GetRow(row int) ReflectArrayRow {
+	return ta.Reflects.GetRow(row)
+}
+
+func (ta *StructTable) GetHeaders() []string {
+	return ta.Columns
+}
+
+func (ta *StructTable) Get() ReflectArray {
+	return ta.Reflects
+}
+
+func (ta *StructTable) Process(name string, Current *Reflect) error {
+
+	for range Only.Once {
+		if Current == nil {
+			ta.Error = errors.New("*Reflect is nil")
+			break
+		}
+
+		ta.Current = Current
+		ta.MapName = name
+		ta.Name = ta.Current.Name()
+		ta.IsValid = true
+
+		if ta.Current.DataStructure.DataTableIndex {
+			ta.ShowIndex = ta.Current.DataStructure.DataTableIndex
+		}
+
+		ta.IndexTitle = "Index"
+		if ta.Current.DataStructure.DataTableIndexTitle != "" {
+			ta.IndexTitle = ta.Current.DataStructure.DataTableIndexTitle
+		}
+
+
+		ta.Rows, ta.Cols = ta.Current.CountChildren()
+		var isPivot bool
+		if ta.Current.DataStructure.DataTablePivot {
+			isPivot = true
+		}
+		if ta.Cols <= 1 {
+			isPivot = true
+		}
+
+		// if rows == 0 {
+		// 	// var refs ReflectArray
+		// 	for row, Child := range ret.Current.Value.Range(true) {
+		// 		fmt.Printf("GetTableData() row[%d]: %s - %s == %s\n", row, Child, Child.ValueKey(), Child.StringValue)
+		//
+		// 		// var refRow ReflectArrayRow
+		// 		// refRow = append(refRow, ChildStruct)
+		// 		//
+		// 		// if len(refRow) > 0 {
+		// 		// 	refs = refs.AddRow(refRow...)
+		// 		// 	continue
+		// 		// }
+		//
+		// 		// Single column.
+		// 		ret.ShowIndex = true
+		// 		// refs = refs.AddRow(Child)
+		// 	}
+		// 	break
+		// }
+
+		ta.PrintDebug("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ta.Current.FieldPath, ta.Current.Kind, ta.Rows, ta.Cols)
+		if ta.Current.IsPointIgnore() {
+			break
+		}
+
+		var refs ReflectArray
+		for row, Child := range ta.Current.ChildReflect {
+			ta.PrintDebug("GetTableData() row[%d]: %s\n", row, Child)
+			if Child.IsPointIgnore() {
+				continue
+			}
+
+			var refRow ReflectArrayRow
+
+			for col, ChildStruct := range Child.ChildReflect {
+				ta.PrintDebug("GetTableData() cell[%d][%d]: %s\n", row, col, Child)
+				if ChildStruct.IsPointIgnore() {
+					continue
+				}
+
+				// Make sure we have a valid sort column name.
+				if ta.Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+					ta.SortOn = ChildStruct.DataStructure.PointName
+				}
+
+				if ChildStruct.IsKnown() {
+					refRow = append(refRow, ChildStruct)
+					continue
+				}
+				refRow = append(refRow, ChildStruct)
+			}
+
+			if len(refRow) > 0 {
+				if ta.ActualCols < len(refRow) {
+					ta.ActualCols = len(refRow)
+				}
+				refs = refs.AddRow(refRow...)
+				continue
+			}
+
+			// Single column.
+			ta.ShowIndex = true
+			if Child.IsPointIgnore() {
+				continue
+			}
+			if ta.ActualCols < len(refRow) {
+				ta.ActualCols = len(refRow)
+			}
+			refs = refs.AddRow(Child)
+		}
+
+		if refs == nil {
+			break
+		}
+
+		if !isPivot {
+			ta.Reflects = refs
+			// ret.AddHeader(ret.Reflects[0]...)
+			break
+		}
+
+		// Handle table pivots here.
+		for row := 0; row < len(refs[0]); row++ {
+			var refRow ReflectArrayRow
+			for col := 0; col < len(refs); col++ {
+				refRow = append(refRow, refs[col][row])
+			}
+			if len(refRow) > 0 {
+				ta.Reflects = ta.Reflects.AddRow(refRow...)
+			}
+		}
+	}
+
+	return ta.Error
+}
+
+func (ta *StructTable) GetValues() StructValues {
+
+	for range Only.Once {
+		ta.Values = make(StructValues, 0)
+		if !ta.IsValid {
+			break
+		}
+
+		colOrder := make(map[string]int)
+		var colOrderIndex int
+
+		var addCol = func(name string) {
+			if _, ok := colOrder[name]; !ok {
+				colOrder[name] = colOrderIndex
+				colOrderIndex++
+			}
+		}
+
+		var colName = func(sub *Reflect, value *valueTypes.UnitValue, length int) string {
+			name := sub.DataStructure.PointName
+			if value.ValueKey() == "" {
+				if name == "" {
+					name = "Column " + strconv.Itoa(length)
+				}
+			} else {
+				name += " " + value.ValueKey()
+			}
+			switch value.Unit() {
+			case "--":
+			case "":
+			default:
+				if !sub.DataStructure.PointVariableUnit {
+					name += " (" + value.Unit() + ")"
+				}
+			}
+			return name
+		}
+
+		// ta.Reflects - contains the rows.
+		// ta.Reflects == 0 - something wrong.
+		// ta.Reflects == 1 - Single row, .
+
+		if len(ta.Reflects) == 0 {
+			// fmt.Println("len(ta.Reflects) == 0")
+			// Probs an array of values.
+			// cm := make(map[string][]valueTypes.UnitValue)
+			// var length int
+			//
+			// if ta.ShowIndex {
+			// 	addCol(ta.IndexTitle)
+			// }
+			// for _, sub := range ta.Current.Value.Range(true) {
+			// 	name := sub.ValueKey()
+			// 	if !ta.Current.IsPointVariableUnit() {
+			// 		switch sub.Unit() {
+			// 			case "--":
+			// 			case "":
+			// 			default:
+			// 				name += " (" + sub.Unit() + ")"
+			// 		}
+			// 		addCol(name)
+			// 	}
+			//
+			// 	cm[name] = sub.Range(valueTypes.SortOrder)
+			// 	l := sub.Value.Length()
+			// 	if l > length {
+			// 		length = l
+			// 	}
+			// }
+			//
+			// for index := 0; index < length; index++ {
+			// 	data := make(StructValue)
+			//
+			// 	if ta.ShowIndex {
+			// 		vi := valueTypes.SetUnitValueInteger(int64(index), ta.IndexTitle, "")
+			// 		data[ta.IndexTitle] = vi
+			// 	}
+			//
+			// 	for name, value := range cm {
+			// 		if index >= len(value) {
+			// 			data[name] = valueTypes.UnitValue{}
+			// 		}
+			// 		data[name] = value[index]
+			// 	}
+			// 	ret = append(ret, data)
+			// }
+			//
+			// ta.Columns = sortMapByValues(colOrder)
+
+			// cm := make(map[string][]valueTypes.UnitValue)
+			// cm[ta.Current.DataStructure.PointName] = ta.Current.Value.Range(valueTypes.SortOrder)
+			// length := ta.Current.Value.Length()
+			// addCol("Key")
+			// addCol("Value")
+			// // data := make(StructValue)
+			// // data["Key"] = value[name]
+			// // ret = append(ret, data)
+			// for index := 0; index < length; index++ {
+			// 	data := make(StructValue)
+			//
+			// 	if ta.ShowIndex {
+			// 		vi := valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
+			// 		data[ta.IndexTitle] = vi
+			// 	}
+			//
+			// 	for name, value := range cm {
+			// 		data[name] = value[index]
+			// 	}
+			// 	ret = append(ret, data)
+			// }
+			break
+		}
+
+
+		if len(ta.Reflects) == 1 {
+			// Probs an array of values - sw we want to pivot the data.
+			cm := make(map[string][]valueTypes.UnitValue)
+			var length int
+
+			if ta.ShowIndex {
+				addCol(ta.IndexTitle)
+			}
+			for _, sub := range ta.Reflects[0] {
+				name := sub.DataStructure.PointName
+				if !sub.DataStructure.PointVariableUnit {
+					switch sub.Value.GetUnit() {
+					case "--":
+					case "":
+					default:
+						name += " (" + sub.Value.GetUnit() + ")"
+					}
+					addCol(name)
+				} else {
+					// addCol(name)
+					// addCol("Units")
+					// cm[name] = sub.Value.Range(valueTypes.SortOrder)
+				}
+
+				cm[name] = sub.Value.Range(valueTypes.SortOrder)
+				l := sub.Value.Length()
+				if l > length {
+					length = l
+				}
+			}
+
+			tin := ta.Current.GetDataTableIndexNames()
+			for index := 0; index < length; index++ {
+				data := make(StructValue)
+
+				if ta.ShowIndex {
+					var vi valueTypes.UnitValue
+					if len(tin) > 0 {
+						vi = valueTypes.SetUnitValueString(ta.IndexTitle, "", tin[index])
+					} else {
+						vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
+					}
+					data[ta.IndexTitle] = vi
+				}
+
+				for name, value := range cm {
+					if index >= len(value) {
+						data[name] = valueTypes.UnitValue{}
+						continue
+						// @TODO - potential issue here.
+					}
+					data[name] = value[index]
+				}
+				ta.Values = append(ta.Values, data)
+			}
+
+			ta.Columns = sortMapByValues(colOrder)
+			break
+		}
+
+
+		if ta.ShowIndex {
+			addCol(ta.IndexTitle)
+		}
+
+		for rowIndex, _ := range ta.Reflects {
+			// fmt.Printf("ROW[%d] - size:%d\n", rowIndex, len(ta.Reflects[rowIndex]))
+			data := make(StructValue)
+			// fmt.Printf("DEBUG[0].FieldPath == %s\n", row[0].FieldPath.String())
+
+			// size := len(ta.Reflects[rowIndex])
+			// if size == 1 {
+			// 	Current := ta.Reflects[rowIndex][0]
+			// 	for _, value := range Current.Value {
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Date"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Point Id"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Value"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: value.Unit()})	// "Unit"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: value.TypeValue})	// "Unit Type"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Group Name"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Description"
+			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Update Freq"
+			// 		ret = append(ret, data)
+			// 	}
+			// 	continue
+			// }
+
+			if ta.ShowIndex {
+				var vi valueTypes.UnitValue
+				vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(rowIndex))
+				data[ta.IndexTitle] = vi
+			}
+
+			for colIndex, col := range ta.Reflects[rowIndex] {
+				// It's important that the values are sorted by table header.
+				// This is so that the headers match with data.
+				if len(col.ChildReflect) > 0 {
+					// Handles
+					for _, sub := range col.ChildReflect {
+						for _, val := range sub.Value.Range(valueTypes.SortOrder) {
+							name := colName(sub, &val, len(data))
+							data[name] = val
+							addCol(name)
+						}
+					}
+					continue
+				}
+
+				if col.IsKnown() {
+					value := ta.Reflects[rowIndex][colIndex].Value
+					// data = append(data, value.Range(valueTypes.SortOrder)...)
+					for _, val := range value.Range(valueTypes.SortOrder) {
+						name := colName(col, &val, len(data))
+						data[name] = val
+						addCol(name)
+					}
+					continue
+				}
+
+				dateFormat := col.DataStructure.PointNameDateFormat
+				if dateFormat == "" {
+					dateFormat = valueTypes.DateTimeLayout
+				}
+				value, _, _ := valueTypes.AnyToUnitValue(col.Value, "", col.DataStructure.PointUnit,
+					col.DataStructure.PointValueType, dateFormat)
+
+				// data = append(data, value.Range(valueTypes.SortOrder)...)
+				for _, val := range value.Range(valueTypes.SortOrder) {
+					name := colName(col, &val, len(data))
+					data[name] = val
+					addCol(name)
+				}
+			}
+			ta.Values = append(ta.Values, data)
+		}
+
+		ta.Columns = sortMapByValues(colOrder)
+
+		// @TODO - Add sorting capability here.
+	}
+
+	return ta.Values
+}
+
+func (ta *StructTable) CreateTable() (output.Table, error) { // (output.Tables, GoStruct.StructValuesMap) {
+
+	for range Only.Once {
+		if ta.Current == nil {
+			ta.Error = errors.New("*Reflect is nil")
+			break
+		}
+
+		values := ta.GetValues()
+		if (values == nil) || (len(values) == 0) {
+			fmt.Printf("No data table results for '%s'\n", ta.MapName)
+			break
+		}
+
+		headers := ta.GetHeaders()
+		ta.Table = output.NewTable(headers...)
+		for row := range values {
+			var items []interface{}
+			for _, col := range ta.Columns {
+				items = append(items, values.GetCell(row, col).String())
+			}
+			ta.Error = ta.Table.AddRow(items...)
+			if ta.Error != nil {
+				break
+			}
+		}
+		if ta.Error != nil {
+			break
+		}
+
+		title := ta.Current.DataStructure.DataTableTitle
+		if title == "" {
+			title = ta.Current.DataStructure.DataTableName
+		}
+		if title == "" {
+			title = valueTypes.PointToName(ta.Current.DataStructure.DataTableId)
+		}
+		// if title == "" {
+		// 	title = valueTypes.PointToName(ta.Current.DataStructure.PointId)
+		// }
+		// dm.EndPoint.GetRequestArgNames()
+
+		ta.Table.SetName(ta.MapName)
+		if title == "" {
+			ta.Table.SetTitle("DataTable %s.%s", ta.Area, ta.Name)
+			ta.Table.SetFilePrefix("%s.%s", ta.Area, ta.Name)
+		} else {
+			ta.Table.SetTitle("DataTable %s.%s (%s)", ta.Area, ta.Name, title)
+			ta.Table.SetFilePrefix("%s.%s-%s", ta.Area, ta.Name, ta.Current.DataStructure.DataTableId)
+		}
+
+		// table.Sort(td.SortOn)
+		ta.Table.SetJson(nil)
+		ta.Table.SetRaw(nil)
+
+		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() {
+		// 		val := value.GetCell(0, col)
+		// 		if val.Type() == "DateTime" {
+		// 			sgd.Options.GraphRequest.TimeColumn = &col
+		// 			break
+		// 		}
+		// 	}
+		// }
+		//
+		// if sgd.Options.GraphRequest.DataColumn == nil {
+		// 	for _, col := range table.GetHeaders() {
+		// 		val := value.GetCell(0, col)
+		// 		if val.IsNumber() {
+		// 			sgd.Options.GraphRequest.DataColumn = &col
+		// 			break
+		// 		}
+		// 	}
+		// }
+		//
+		// if sgd.Options.GraphRequest.ValueColumn == nil {
+		// 	for _, col := range table.GetHeaders() {
+		// 		val := value.GetCell(0, col)
+		// 		if val.IsNumber() {
+		// 			sgd.Options.GraphRequest.ValueColumn = &col
+		// 			break
+		// 		}
+		// 	}
+		// }
+	}
+
+	return ta.Table, ta.Error
+}
+
+
+type ReflectArray []ReflectArrayRow
+type ReflectArrayRow []*Reflect
+
+func (ta *ReflectArray) AddRow(refs ...*Reflect) ReflectArray {
+	for range Only.Once {
+		if ta == nil {
+			*ta = make(ReflectArray, 0)
+		}
+
+		var row ReflectArrayRow
+		row = append(row, refs...)
+		*ta = append(*ta, row)
+	}
+	return *ta
+}
+
+func (ta *ReflectArray) GetRow(row int) ReflectArrayRow {
+	if row >= len(*ta) {
+		return ReflectArrayRow{}
+	}
+	return (*ta)[row]
+}
+
+
+type StructValuesMap map[string]StructValues
+type StructValue map[string]valueTypes.UnitValue
+
+type StructValues []StructValue
+
+func (ta *StructValues) GetCell(row int, col string) valueTypes.UnitValue {
+	var ret valueTypes.UnitValue
+	for range Only.Once {
+		if row >= len(*ta) {
+			ret = valueTypes.SetUnitValueString("error", "error", "row > size")
+			break
+		}
+
+		if _, ok := (*ta)[row][col]; !ok {
+			ret = valueTypes.SetUnitValueString("", "", "")
+			break
+		}
+
+		ret = (*ta)[row][col]
+	}
+	return ret
+}
+
+
+func sortMapByValues(data map[string]int) []string {
+	var ret []string
+	keys := make([]string, 0, len(data))
+
+	for key := range data {
+		keys = append(keys, key)
+	}
+	sort.SliceStable(keys, func(i, j int) bool{
+		return data[keys[i]] < data[keys[j]]
+	})
+
+	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 5127a4e63..053fe712e 100644
--- a/iSolarCloud/api/GoStruct/structmap.go
+++ b/iSolarCloud/api/GoStruct/structmap.go
@@ -7,8 +7,6 @@ import (
 	"github.com/MickMake/GoUnify/Only"
 	"os"
 	"reflect"
-	"sort"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -29,12 +27,14 @@ type StructMapOptions struct {
 type StructMap struct {
 	StructMapOptions
 
-	SortOn                string
-	Start                 *Reflect
-	Map                   map[string]*Reflect
-	TableMap              map[string]*Reflect
-	VirtualMap            map[string]*Reflect
-	_Timestamp            valueTypes.DateTime
+	SortOn     string
+	Start      *Reflect
+	Map        map[string]*Reflect
+	TableMap   map[string]*Reflect
+	VirtualMap map[string]*Reflect
+	_Timestamp valueTypes.DateTime
+
+	Error      error
 }
 
 func (sm *StructMap) PrintDebug(format string, args ...interface{})  {
@@ -729,607 +729,6 @@ func (sm *StructMap) IsPointSplitOn(Current *Reflect) bool {
 }
 
 
-func (sm *StructMap) GetTables() StructTables {
-	var ret StructTables
-
-	for range Only.Once {
-		st := sm.GetResultTableData()
-		ret = append(ret, st)
-
-		names := sm.GetTableNames()
-		for _, name := range names {
-			st = sm.GetTableData(name)
-			if !st.IsValid {
-				continue
-			}
-			ret = append(ret, st)
-		}
-
-	}
-
-	return ret
-}
-
-func (sm *StructMap) GetTableNames() []string {
-	var ret []string
-
-	for range Only.Once {
-		for name := range sm.TableMap {
-			ret = append(ret, name)
-		}
-	}
-
-	return ret
-}
-
-func (sm *StructMap) GetTableData(name string) StructTable {
-	var ret StructTable
-
-	for range Only.Once {
-		var ok bool
-		if ret.Current, ok = sm.TableMap[name]; !ok {
-			break
-		}
-
-		ret.Name = ret.Current.Name()
-		ret.IsValid = true
-
-		if ret.Current.DataStructure.DataTableIndex {
-			ret.ShowIndex = ret.Current.DataStructure.DataTableIndex
-		}
-
-		ret.IndexTitle = "Index"
-		if ret.Current.DataStructure.DataTableIndexTitle != "" {
-			ret.IndexTitle = ret.Current.DataStructure.DataTableIndexTitle
-		}
-
-
-		ret.Rows, ret.Cols = ret.Current.CountChildren()
-		var isPivot bool
-		if ret.Current.DataStructure.DataTablePivot {
-			isPivot = true
-		}
-		if ret.Cols <= 1 {
-			isPivot = true
-		}
-
-		// if rows == 0 {
-		// 	// var refs ReflectArray
-		// 	for row, Child := range ret.Current.Value.Range(true) {
-		// 		fmt.Printf("GetTableData() row[%d]: %s - %s == %s\n", row, Child, Child.ValueKey(), Child.StringValue)
-		//
-		// 		// var refRow ReflectArrayRow
-		// 		// refRow = append(refRow, ChildStruct)
-		// 		//
-		// 		// if len(refRow) > 0 {
-		// 		// 	refs = refs.AddRow(refRow...)
-		// 		// 	continue
-		// 		// }
-		//
-		// 		// Single column.
-		// 		ret.ShowIndex = true
-		// 		// refs = refs.AddRow(Child)
-		// 	}
-		// 	break
-		// }
-
-		sm.PrintDebug("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, ret.Rows, ret.Cols)
-		if ret.Current.IsPointIgnore() {
-			break
-		}
-
-		var refs ReflectArray
-		for row, Child := range ret.Current.ChildReflect {
-			sm.PrintDebug("GetTableData() row[%d]: %s\n", row, Child)
-			if Child.IsPointIgnore() {
-				continue
-			}
-
-			var refRow ReflectArrayRow
-
-			for col, ChildStruct := range Child.ChildReflect {
-				sm.PrintDebug("GetTableData() cell[%d][%d]: %s\n", row, col, Child)
-				if ChildStruct.IsPointIgnore() {
-					continue
-				}
-
-				// Make sure we have a valid sort column name.
-				if ret.Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
-					ret.SortOn = ChildStruct.DataStructure.PointName
-				}
-
-				if ChildStruct.IsKnown() {
-					refRow = append(refRow, ChildStruct)
-					continue
-				}
-				refRow = append(refRow, ChildStruct)
-			}
-
-			if len(refRow) > 0 {
-				if ret.ActualCols < len(refRow) {
-					ret.ActualCols = len(refRow)
-				}
-				refs = refs.AddRow(refRow...)
-				continue
-			}
-
-			// Single column.
-			ret.ShowIndex = true
-			if Child.IsPointIgnore() {
-				continue
-			}
-			if ret.ActualCols < len(refRow) {
-				ret.ActualCols = len(refRow)
-			}
-			refs = refs.AddRow(Child)
-		}
-
-		if refs == nil {
-			break
-		}
-
-		if !isPivot {
-			ret.Reflects = refs
-			// ret.AddHeader(ret.Reflects[0]...)
-			break
-		}
-
-		// Handle table pivots here.
-		for row := 0; row < len(refs[0]); row++ {
-			var refRow ReflectArrayRow
-			for col := 0; col < len(refs); col++ {
-				refRow = append(refRow, refs[col][row])
-			}
-			if len(refRow) > 0 {
-				ret.Reflects = ret.Reflects.AddRow(refRow...)
-			}
-		}
-	}
-
-	return ret
-}
-
-func (sm *StructMap) GetResultTableData() StructTable {
-	var ret StructTable
-
-	fmt.Printf("NOT IMPLEMENTED YET.\n")
-	// for range Only.Once {
-	// 	var sorted []string
-	// 	// @TODO - Add in other column sorting options here.
-	// 	for name := range sm.Map {
-	// 		sorted = append(sorted, name)
-	// 	}
-	//
-	// 	ret.Name = "Results"
-	// 	ret.IsValid = true
-	//
-	// 	for _, name := range sorted {
-	// 		Current := sm.Map[name]
-	//
-	// 		rows, cols := Current.CountChildren()
-	// 		// fmt.Printf("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, rows, cols)
-	// 		sm.PrintDebug("GetResultTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, Current.FieldPath, Current.Kind, rows, cols)
-	// 		if Current.IsPointIgnore() {
-	// 			break
-	// 		}
-	//
-	// 		// if len(refs) > 0 {
-	// 		// 	ret.AddRow(refs...)
-	// 		// }
-	//
-	// 		// for row, Child := range Current.ChildReflect {
-	// 		// 	fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d\n", Child.FieldPath, ret.Current.Kind,
-	// 		// 		Child.IsKnown(),
-	// 		// 		len(ret.Current.ChildReflect),
-	// 		// 		len(Child.ChildReflect))
-	// 		// 	if sm.Debug {
-	// 		// 		_, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() row[%d]: %s\n", row, Child)
-	// 		// 	}
-	// 		// 	if Child.IsPointIgnore() {
-	// 		// 		continue
-	// 		// 	}
-	// 		//
-	// 		// 	var refs []*Reflect
-	// 		//
-	// 		// 	for col, ChildStruct := range Child.ChildReflect {
-	// 		// 		// fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d / ChildStruct:%d\n", ChildStruct.FieldPath, ret.Current.Kind,
-	// 		// 		// 	ChildStruct.IsKnown(),
-	// 		// 		// 	len(ret.Current.ChildReflect),
-	// 		// 		// 	len(Child.ChildReflect),
-	// 		// 		// 	len(ChildStruct.ChildReflect))
-	// 		// 		if sm.Debug {
-	// 		// 			_, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() cell[%d][%d]: %s\n", row, col, Child)
-	// 		// 		}
-	// 		// 		if ChildStruct.IsPointIgnore() {
-	// 		// 			continue
-	// 		// 		}
-	// 		//
-	// 		// 		// Make sure we have a valid sort column name.
-	// 		// 		if Current.DataStructure.DataTableSortOn != "" {
-	// 		// 			if Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
-	// 		// 				ret.SortOn = ChildStruct.DataStructure.PointName
-	// 		// 			}
-	// 		// 		}
-	// 		//
-	// 		// 		if ChildStruct.IsKnown() {
-	// 		// 			refs = append(refs, ChildStruct)
-	// 		// 			continue
-	// 		// 		}
-	// 		// 		refs = append(refs, ChildStruct)
-	// 		// 	}
-	// 		//
-	// 		// 	if len(refs) > 0 {
-	// 		// 		ret.AddRow(refs...)
-	// 		// 	}
-	// 	}
-	// }
-
-	return ret
-}
-
-
-type StructTable struct {
-	Name       string
-	Current    *Reflect
-	Reflects   ReflectArray
-	SortOn     string
-	ShowIndex  bool
-	IndexTitle string
-	IsValid    bool
-	Columns    []string
-	Rows       int
-	Cols       int
-	ActualRows int
-	ActualCols int
-}
-
-
-type ReflectArray []ReflectArrayRow
-type ReflectArrayRow []*Reflect
-
-func (ta *ReflectArray) AddRow(refs ...*Reflect) ReflectArray {
-	for range Only.Once {
-		if ta == nil {
-			*ta = make(ReflectArray, 0)
-		}
-
-		var row ReflectArrayRow
-		row = append(row, refs...)
-		*ta = append(*ta, row)
-	}
-	return *ta
-}
-
-func (ta *ReflectArray) GetRow(row int) ReflectArrayRow {
-	if row >= len(*ta) {
-		return ReflectArrayRow{}
-	}
-	return (*ta)[row]
-}
-
-
-type StructTables []StructTable
-type StructValues []StructValue
-type StructValue map[string]valueTypes.UnitValue
-
-func (ta *StructValues) GetCell(row int, col string) string {
-	var ret string
-	for range Only.Once {
-		if row >= len(*ta) {
-			ret = "row > size"
-			break
-		}
-
-		if _, ok := (*ta)[row][col]; !ok {
-			ret = ""
-			break
-		}
-
-		ret = (*ta)[row][col].String()
-	}
-	return ret
-}
-
-func (ta *StructTable) AddRow(refs ...*Reflect) {
-	for range Only.Once {
-		if ta.Reflects == nil {
-			ta.Reflects = make(ReflectArray, 0)
-		}
-
-		// var row ReflectArrayRow
-		// row = append(row, refs...)
-		ta.Reflects = append(ta.Reflects, append(ReflectArrayRow{}, refs...))
-	}
-}
-
-func (ta *StructTable) GetRow(row int) ReflectArrayRow {
-	return ta.Reflects.GetRow(row)
-}
-
-func (ta *StructTable) GetHeaders() []string {
-	return ta.Columns
-}
-
-func (ta *StructTable) Get() ReflectArray {
-	return ta.Reflects
-}
-
-func (ta *StructTable) GetValues() StructValues {
-	ret := make(StructValues, 0)
-
-	for range Only.Once {
-		if !ta.IsValid {
-			break
-		}
-
-		colOrder := make(map[string]int)
-		var colOrderIndex int
-
-		var addCol = func(name string) {
-			if _, ok := colOrder[name]; !ok {
-				colOrder[name] = colOrderIndex
-				colOrderIndex++
-			}
-		}
-
-		var colName = func(sub *Reflect, value *valueTypes.UnitValue, length int) string {
-			name := sub.DataStructure.PointName
-			if value.ValueKey() == "" {
-				if name == "" {
-					name = "Column " + strconv.Itoa(length)
-				}
-			} else {
-				name += " " + value.ValueKey()
-			}
-			switch value.Unit() {
-				case "--":
-				case "":
-				default:
-					if !sub.DataStructure.PointVariableUnit {
-						name += " (" + value.Unit() + ")"
-					}
-				}
-			return name
-		}
-
-		// ta.Reflects - contains the rows.
-		// ta.Reflects == 0 - something wrong.
-		// ta.Reflects == 1 - Single row, .
-
-		if len(ta.Reflects) == 0 {
-			// fmt.Println("len(ta.Reflects) == 0")
-			// Probs an array of values.
-			// cm := make(map[string][]valueTypes.UnitValue)
-			// var length int
-			//
-			// if ta.ShowIndex {
-			// 	addCol(ta.IndexTitle)
-			// }
-			// for _, sub := range ta.Current.Value.Range(true) {
-			// 	name := sub.ValueKey()
-			// 	if !ta.Current.IsPointVariableUnit() {
-			// 		switch sub.Unit() {
-			// 			case "--":
-			// 			case "":
-			// 			default:
-			// 				name += " (" + sub.Unit() + ")"
-			// 		}
-			// 		addCol(name)
-			// 	}
-			//
-			// 	cm[name] = sub.Range(valueTypes.SortOrder)
-			// 	l := sub.Value.Length()
-			// 	if l > length {
-			// 		length = l
-			// 	}
-			// }
-			//
-			// for index := 0; index < length; index++ {
-			// 	data := make(StructValue)
-			//
-			// 	if ta.ShowIndex {
-			// 		vi := valueTypes.SetUnitValueInteger(int64(index), ta.IndexTitle, "")
-			// 		data[ta.IndexTitle] = vi
-			// 	}
-			//
-			// 	for name, value := range cm {
-			// 		if index >= len(value) {
-			// 			data[name] = valueTypes.UnitValue{}
-			// 		}
-			// 		data[name] = value[index]
-			// 	}
-			// 	ret = append(ret, data)
-			// }
-			//
-			// ta.Columns = sortMapByValues(colOrder)
-
-			// cm := make(map[string][]valueTypes.UnitValue)
-			// cm[ta.Current.DataStructure.PointName] = ta.Current.Value.Range(valueTypes.SortOrder)
-			// length := ta.Current.Value.Length()
-			// addCol("Key")
-			// addCol("Value")
-			// // data := make(StructValue)
-			// // data["Key"] = value[name]
-			// // ret = append(ret, data)
-			// for index := 0; index < length; index++ {
-			// 	data := make(StructValue)
-			//
-			// 	if ta.ShowIndex {
-			// 		vi := valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
-			// 		data[ta.IndexTitle] = vi
-			// 	}
-			//
-			// 	for name, value := range cm {
-			// 		data[name] = value[index]
-			// 	}
-			// 	ret = append(ret, data)
-			// }
-			break
-		}
-
-
-		if len(ta.Reflects) == 1 {
-			// Probs an array of values - sw we want to pivot the data.
-			cm := make(map[string][]valueTypes.UnitValue)
-			var length int
-
-			if ta.ShowIndex {
-				addCol(ta.IndexTitle)
-			}
-			for _, sub := range ta.Reflects[0] {
-				name := sub.DataStructure.PointName
-				if !sub.DataStructure.PointVariableUnit {
-					switch sub.Value.GetUnit() {
-						case "--":
-						case "":
-						default:
-							name += " (" + sub.Value.GetUnit() + ")"
-					}
-					addCol(name)
-				} else {
-					// addCol(name)
-					// addCol("Units")
-					// cm[name] = sub.Value.Range(valueTypes.SortOrder)
-				}
-
-				cm[name] = sub.Value.Range(valueTypes.SortOrder)
-				l := sub.Value.Length()
-				if l > length {
-					length = l
-				}
-			}
-
-			tin := ta.Current.GetDataTableIndexNames()
-			for index := 0; index < length; index++ {
-				data := make(StructValue)
-
-				if ta.ShowIndex {
-					var vi valueTypes.UnitValue
-					if len(tin) > 0 {
-						vi = valueTypes.SetUnitValueString(ta.IndexTitle, "", tin[index])
-					} else {
-						vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(index))
-					}
-					data[ta.IndexTitle] = vi
-				}
-
-				for name, value := range cm {
-					if index >= len(value) {
-						data[name] = valueTypes.UnitValue{}
-						continue
-						// @TODO - potential issue here.
-					}
-					data[name] = value[index]
-				}
-				ret = append(ret, data)
-			}
-
-			ta.Columns = sortMapByValues(colOrder)
-			break
-		}
-
-
-		if ta.ShowIndex {
-			addCol(ta.IndexTitle)
-		}
-
-		for rowIndex, _ := range ta.Reflects {
-			// fmt.Printf("ROW[%d] - size:%d\n", rowIndex, len(ta.Reflects[rowIndex]))
-			data := make(StructValue)
-			// fmt.Printf("DEBUG[0].FieldPath == %s\n", row[0].FieldPath.String())
-
-			// size := len(ta.Reflects[rowIndex])
-			// if size == 1 {
-			// 	Current := ta.Reflects[rowIndex][0]
-			// 	for _, value := range Current.Value {
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Date"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Point Id"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Value"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: value.Unit()})	// "Unit"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: value.TypeValue})	// "Unit Type"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Group Name"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Description"
-			// 		data = append(data, valueTypes.UnitValue{StringValue: ""})	// "Update Freq"
-			// 		ret = append(ret, data)
-			// 	}
-			// 	continue
-			// }
-
-			if ta.ShowIndex {
-				var vi valueTypes.UnitValue
-				vi = valueTypes.SetUnitValueInteger(ta.IndexTitle, "", int64(rowIndex))
-				data[ta.IndexTitle] = vi
-			}
-
-			for colIndex, col := range ta.Reflects[rowIndex] {
-				// It's important that the values are sorted by table header.
-				// This is so that the headers match with data.
-				if len(col.ChildReflect) > 0 {
-					// Handles
-					for _, sub := range col.ChildReflect {
-						for _, val := range sub.Value.Range(valueTypes.SortOrder) {
-							name := colName(sub, &val, len(data))
-							data[name] = val
-							addCol(name)
-						}
-					}
-					continue
-				}
-
-				if col.IsKnown() {
-					value := ta.Reflects[rowIndex][colIndex].Value
-					// data = append(data, value.Range(valueTypes.SortOrder)...)
-					for _, val := range value.Range(valueTypes.SortOrder) {
-						name := colName(col, &val, len(data))
-						data[name] = val
-						addCol(name)
-					}
-					continue
-				}
-
-				dateFormat := col.DataStructure.PointNameDateFormat
-				if dateFormat == "" {
-					dateFormat = valueTypes.DateTimeLayout
-				}
-				value, _, _ := valueTypes.AnyToUnitValue(col.Value, "", col.DataStructure.PointUnit,
-					col.DataStructure.PointValueType, dateFormat)
-
-				// data = append(data, value.Range(valueTypes.SortOrder)...)
-				for _, val := range value.Range(valueTypes.SortOrder) {
-					name := colName(col, &val, len(data))
-					data[name] = val
-					addCol(name)
-				}
-			}
-			ret = append(ret, data)
-		}
-
-		ta.Columns = sortMapByValues(colOrder)
-
-		// @TODO - Add sorting capability here.
-	}
-
-	return ret
-}
-
-func sortMapByValues(data map[string]int) []string {
-	var ret []string
-	keys := make([]string, 0, len(data))
-
-	for key := range data {
-		keys = append(keys, key)
-	}
-	sort.SliceStable(keys, func(i, j int) bool{
-		return data[keys[i]] < data[keys[j]]
-	})
-
-	for _, k := range keys{
-		ret = append(ret, k)
-	}
-	return ret
-}
-
-
 // func (sm *StructMap) SaveGoStructOptions(Child *Reflect) bool {
 // 	var yes bool
 //
diff --git a/iSolarCloud/api/GoStruct/valueTypes/types.go b/iSolarCloud/api/GoStruct/valueTypes/types.go
index 7e6c8cf29..430818a48 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/types.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/types.go
@@ -284,8 +284,9 @@ func SizeOfArrayLength(ref interface{}) int {
 
 func AnyToUnitValue(ref interface{}, key string, unit string, typeString string, dateFormat string) (UnitValues, bool, bool) {
 	var uvs UnitValues
-	ok := true
 	isNil := false
+	ok := true
+
 	for range Only.Once {
 		if IsNil(ref) {
 			// fmt.Println("DEBUG: AnyToUnitValue(): NIL")
@@ -499,6 +500,7 @@ func AnyToUnitValue(ref interface{}, key string, unit string, typeString string,
 				ok = false
 		}
 	}
+
 	return uvs, isNil, ok
 }
 
diff --git a/iSolarCloud/api/GoStruct/valueTypes/uv.go b/iSolarCloud/api/GoStruct/valueTypes/uv.go
index 062758f8f..9d128529f 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/uv.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/uv.go
@@ -16,13 +16,13 @@ type UnitValue struct {
 
 	TypeValue   string `json:"type_value"`
 
-	*float64     `json:"value_float,omitempty"`
-	*int64       `json:"value_int,omitempty"`
-	*bool        `json:"value_bool,omitempty"`
+	*float64    `json:"value_float,omitempty"`
+	*int64      `json:"value_int,omitempty"`
+	*bool       `json:"value_bool,omitempty"`
 
 	key         string
 	deviceId    string
-	Valid       bool `json:"valid"`
+	Valid       bool  `json:"valid"`
 	Error       error `json:"-"`
 }
 
@@ -293,6 +293,37 @@ func (t *UnitValue) ValueKey() string {
 	return t.key
 }
 
+func (t *UnitValue) IsFloat() bool {
+	if t.float64 != nil {
+		return true
+	}
+	return false
+}
+
+func (t *UnitValue) IsInt() bool {
+	if t.int64 != nil {
+		return true
+	}
+	return false
+}
+
+func (t *UnitValue) IsNumber() bool {
+	if t.float64 != nil {
+		return true
+	}
+	if t.int64 != nil {
+		return true
+	}
+	return false
+}
+
+func (t *UnitValue) IsBool() bool {
+	if t.float64 != nil {
+		return true
+	}
+	return false
+}
+
 func (t UnitValue) String() string {
 	var ret string
 	for range Only.Once {
@@ -350,6 +381,13 @@ func (t *UnitValue) Type() string {
 	return t.TypeValue
 }
 
+func (t *UnitValue) IsTypeDateTime() bool {
+	if t.TypeValue == "DateTime" {
+		return true
+	}
+	return false
+}
+
 func (t *UnitValue) DeviceId() string {
 	return t.deviceId
 }
diff --git a/iSolarCloud/api/legacy.go b/iSolarCloud/api/legacy.go
index 1b66e64f2..653907198 100644
--- a/iSolarCloud/api/legacy.go
+++ b/iSolarCloud/api/legacy.go
@@ -1,5 +1,106 @@
 package api
 
+// -------------------------------------------------------------------------------- //
+// From struct_data.go
+//
+// func (dm *DataMap) CopyDataEntries(dep DataEntries, endpoint string, pointId string, name string) *DataEntries {
+// 	var ret *DataEntries
+// 	for range Only.Once {
+// 		var des DataEntries
+// 		des = dep.Copy()
+// 		for i := range des.Entries {
+// 			des.Entries[i].SetEndpoint(endpoint, pointId)
+// 			des.Entries[i].SetPointName(name)
+// 			dm.Add(des.Entries[i])
+// 		}
+//
+// 		if len(des.Entries) == 0 {
+// 			fmt.Printf("OOOPS\n")
+// 		}
+// 		epn := des.Entries[0].EndPoint
+// 		ret = dm.Map[epn]
+// 	}
+// 	return ret
+// }
+//
+// func (dm *DataMap) TableSort() []string {
+// 	var sorted []string
+//
+// 	for range Only.Once {
+// 		for p := range dm.DataTables {
+// 			sorted = append(sorted, p)
+// 		}
+// 		sort.Strings(sorted)
+// 	}
+// 	return sorted
+// }
+//
+// func (dm *DataMap) AddAny(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, value interface{}, unit string, Type string, timeSpan string) {
+//
+// 	for range Only.Once {
+// 		var point Point
+// 		p := GetPoint(parentDeviceId + "." + pid.String())
+// 		if p == nil {
+// 			// No point found. Create one.
+// 			point = CreatePoint(parentDeviceId, pid, name, groupName, unit, Type, timeSpan)
+// 		} else {
+// 			point = *p
+// 		}
+//
+// 		uvs, isNil, ok := valueTypes.AnyToUnitValue(value, unit, Type, valueTypes.DateTimeLayout)
+// 		if !ok {
+// 			fmt.Printf("ERROR: AddAny(endpoint '%s', parentId '%s', pid '%s', name '%s', date '%s', value '%v')",
+// 				endpoint, parentDeviceId, pid, name, date, value)
+// 			break
+// 		}
+// 		if isNil {
+// 			point.ValueType += "(NIL)"
+// 		}
+//
+// 		for _, uv := range uvs {
+// 			if uv.GetUnit() != point.Unit {
+// 				fmt.Printf("OOOPS: Unit mismatch - %f %s != %f %s\n", value, point.Unit, uv.ValueFloat(), uv.GetUnit())
+// 				point.Unit = uv.GetUnit()
+// 			}
+//
+// 			var parent ParentDevice
+// 			parent.Set(parentDeviceId)
+// 			point.Parents.Add(parent)
+//
+// 			de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
+// 			de.Point = &point
+// 			dm.Add(de)
+// 		}
+// 	}
+// }
+//
+// func (dm *DataMap) AddUnitValue(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, uv valueTypes.UnitValue, timeSpan string) {
+//
+// 	for range Only.Once {
+// 		var point Point
+// 		p := GetPoint(parentDeviceId + "." + pid.String())
+// 		if p == nil {
+// 			// No point found. Create one.
+// 			point = CreatePoint(parentDeviceId, pid, name, groupName, uv.GetUnit(), uv.Type(), timeSpan)
+// 		} else {
+// 			point = *p
+// 		}
+//
+// 		if uv.GetUnit() != point.Unit {
+// 			fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n", uv.String(), point.Unit, uv.ValueFloat(), uv.GetUnit())
+// 			point.Unit = uv.GetUnit()
+// 		}
+//
+// 		var parent ParentDevice
+// 		parent.Set(parentDeviceId)
+// 		point.Parents.Add(parent)
+//
+// 		de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
+// 		de.Point = &point
+// 		dm.Add(de)
+// 	}
+// }
+
 
 // -------------------------------------------------------------------------------- //
 // From struct_de.go
@@ -197,6 +298,109 @@ package api
 // 	}
 // 	return de
 // }
+//
+// func (dm *DataMap) CreateDataTables() Tables {
+// 	tables := make(Tables, 0)
+//
+// 	for range Only.Once {
+// 		for name := range dm.StructMap.TableMap {
+// 			// values = make(GoStruct.StructValuesMap)
+//
+// 			td := dm.StructMap.GetTableData(name)
+// 			if !td.IsValid {
+// 				continue
+// 			}
+//
+// 			values := td.GetValues()
+// 			if (values == nil) || (len(values) == 0) {
+// 				fmt.Printf("No data table results for '%s'\n", name)
+// 				break
+// 			}
+//
+// 			headers := td.GetHeaders()
+// 			table := output.NewTable(headers...)
+// 			for row := range values {
+// 				var items []interface{}
+// 				for _, col := range td.Columns {
+// 					items = append(items, values.GetCell(row, col))
+// 				}
+// 				dm.Error = table.AddRow(items...)
+// 				if dm.Error != nil {
+// 					break
+// 				}
+// 			}
+// 			if dm.Error != nil {
+// 				break
+// 			}
+//
+// 			title := td.Current.DataStructure.DataTableTitle
+// 			if title == "" {
+// 				title = td.Current.DataStructure.DataTableName
+// 			}
+// 			if title == "" {
+// 				title = valueTypes.PointToName(td.Current.DataStructure.DataTableId)
+// 			}
+// 			// if title == "" {
+// 			// 	title = valueTypes.PointToName(td.Current.DataStructure.PointId)
+// 			// }
+// 			// dm.EndPoint.GetRequestArgNames()
+//
+// 			table.SetName(name)
+// 			if title == "" {
+// 				table.SetTitle("DataTable %s.%s", dm.EndPoint.GetArea(), td.Name)
+// 				table.SetFilePrefix("%s.%s", dm.EndPoint.GetArea(), td.Name)
+// 			} else {
+// 				table.SetTitle("DataTable %s.%s (%s)", dm.EndPoint.GetArea(), td.Name, title)
+// 				table.SetFilePrefix("%s.%s-%s", dm.EndPoint.GetArea(), td.Name, td.Current.DataStructure.DataTableId)
+// 			}
+//
+// 			// table.Sort(td.SortOn)
+// 			table.SetJson(nil)
+// 			table.SetRaw(nil)
+//
+// 			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() {
+// 			// 		val := value.GetCell(0, col)
+// 			// 		if val.Type() == "DateTime" {
+// 			// 			sgd.Options.GraphRequest.TimeColumn = &col
+// 			// 			break
+// 			// 		}
+// 			// 	}
+// 			// }
+// 			//
+// 			// if sgd.Options.GraphRequest.DataColumn == nil {
+// 			// 	for _, col := range table.GetHeaders() {
+// 			// 		val := value.GetCell(0, col)
+// 			// 		if val.IsNumber() {
+// 			// 			sgd.Options.GraphRequest.DataColumn = &col
+// 			// 			break
+// 			// 		}
+// 			// 	}
+// 			// }
+// 			//
+// 			// if sgd.Options.GraphRequest.ValueColumn == nil {
+// 			// 	for _, col := range table.GetHeaders() {
+// 			// 		val := value.GetCell(0, col)
+// 			// 		if val.IsNumber() {
+// 			// 			sgd.Options.GraphRequest.ValueColumn = &col
+// 			// 			break
+// 			// 		}
+// 			// 	}
+// 			// }
+//
+// 			tables[name] = Table {
+// 				Values: values,
+// 				Table:  table,
+// 			}
+// 			// values[name] = vals
+// 			// tables[name] = table
+// 		}
+// 	}
+//
+// 	return tables
+// }
 
 
 // -------------------------------------------------------------------------------- //
diff --git a/iSolarCloud/api/struct_data.go b/iSolarCloud/api/struct_data.go
index 12ad95249..b8f69181f 100644
--- a/iSolarCloud/api/struct_data.go
+++ b/iSolarCloud/api/struct_data.go
@@ -17,7 +17,7 @@ import (
 
 
 type DataMap struct {
-	Map        map[string]*DataEntries
+	Map            map[string]*DataEntries
 
 	parentDeviceId string
 	TimeStamp      time.Time
@@ -34,314 +34,6 @@ func NewDataMap() DataMap {
 	}
 }
 
-func (dm *DataMap) ProcessMap() {
-	for range Only.Once {
-		// Convert Struct.Map to DataMap
-		for _, Child := range dm.StructMap.Map {
-			if Child.IsPointIgnore() {
-				continue
-			}
-
-			var when valueTypes.DateTime
-			if Child.IsPointTimestampNotZero() {
-				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
-			} else {
-				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
-			}
-
-			pdi := dm.parentDeviceId
-			if Child.DataStructure.PointDevice != "" {
-				pdi = Child.DataStructure.PointDevice
-			}
-
-			dm.AddPointUnitValues(Child, pdi, when)
-		}
-
-		// Convert Struct.VirtualMap to DataMap
-		for _, Child := range dm.StructMap.VirtualMap {
-			if Child.IsPointIgnore() {
-				continue
-			}
-
-			var when valueTypes.DateTime
-			if Child.IsPointTimestampNotZero() {
-				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
-			} else {
-				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
-			}
-
-			pdi := dm.parentDeviceId
-			if Child.DataStructure.PointDevice != "" {
-				pdi = Child.DataStructure.PointDevice
-			}
-
-			if Child.DataStructure.PointVirtualShift > 0 {
-				Child.DataStructure.Endpoint.ShiftLeft(Child.DataStructure.PointVirtualShift)
-				Child.DataStructure.Endpoint.InsertFirst("virtual")
-			} else {
-				Child.DataStructure.Endpoint.ReplaceFirst("virtual")
-			}
-			dm.AddPointUnitValues(Child, pdi, when)
-		}
-	}
-}
-
-func (dm *DataMap) ProcessMapForMqtt() {
-	for range Only.Once {
-		// Convert StructMap to DataMap
-		for _, Child := range dm.StructMap.Map {
-			if Child.IsPointIgnore() {
-				fmt.Printf("[%s] - IGNORE\n", Child.FieldPath.String())
-				continue
-			}
-
-			if Child.CurrentReflect.IsPointListFlatten() {
-				// fmt.Printf("[%s] - PointListFlatten", Child.FieldPath.String())
-				// if len(de.Current.ChildReflect) > 0 {
-				// 	continue // We already have the children.
-				// }
-				if len(Child.ChildReflect) == 0 {
-					// fmt.Printf(" - IGNORE\n")
-					// fmt.Printf(" - ignore\n")
-					continue // Ignore points with no children.
-				}
-				// fmt.Println("")
-			}
-
-			if Child.DataStructure.DataTable {
-				continue	// We are a datatable parent.
-			}
-
-			var when valueTypes.DateTime
-			if Child.IsPointTimestampNotZero() {
-				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
-			} else {
-				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
-			}
-
-			pdi := dm.parentDeviceId
-			if Child.DataStructure.PointDevice != "" {
-				pdi = Child.DataStructure.PointDevice
-			}
-
-			dm.AddPointUnitValues(Child, pdi, when)
-		}
-	}
-}
-
-func (dm *DataMap) CreateDataTables() output.Tables {
-	ret := make(output.Tables)
-
-	for range Only.Once {
-		ret = output.NewTables()
-
-		names := dm.StructMap.GetTableNames()
-		for _, name := range names {
-			td := dm.StructMap.GetTableData(name)
-			if !td.IsValid {
-				continue
-			}
-
-			values := td.GetValues()
-			if (values == nil) || (len(values) == 0) {
-				fmt.Printf("No data table results for '%s'\n", name)
-				break
-			}
-
-			headers := td.GetHeaders()
-			table := output.NewTable(headers...)
-			for row := range values {
-				var items []interface{}
-				for _, col := range td.Columns {
-					items = append(items, values.GetCell(row, col))
-				}
-				dm.Error = table.AddRow(items...)
-				if dm.Error != nil {
-					break
-				}
-			}
-			if dm.Error != nil {
-				break
-			}
-
-			title := td.Current.DataStructure.DataTableTitle
-			if title == "" {
-				title = td.Current.DataStructure.DataTableName
-			}
-			if title == "" {
-				title = valueTypes.PointToName(td.Current.DataStructure.DataTableId)
-			}
-			// if title == "" {
-			// 	title = valueTypes.PointToName(td.Current.DataStructure.PointId)
-			// }
-
-			table.SetName(name)
-			table.SetTitle("Data Table %s - %s", td.Name, title)
-			if td.Current.DataStructure.DataTableId == "" {
-				table.SetFilePrefix(td.Name)
-			} else {
-				table.SetFilePrefix("%s-%s", td.Name, td.Current.DataStructure.DataTableId)
-			}
-			table.SetGraphFilter("")
-			table.Sort(td.SortOn)
-			table.SetJson(nil)
-			table.SetRaw(nil)
-
-			ret[name] = table
-		}
-	}
-
-	return ret
-}
-
-func (dm *DataMap) CreateResultTable(full bool) output.Table {
-	var ret output.Table
-
-	for range Only.Once {
-		ret = output.NewTable(
-			"Date",
-			"Point Id",
-			"Value",
-			"Unit",
-			"Unit Type",
-			"Group Name",
-			"Description",
-			"Update Freq",
-		)
-
-		for _, p := range dm.Sort() {
-			entries := dm.Map[p].Entries
-			for _, de := range entries {
-				if full {
-					if de.Current.DataStructure.DataTable {
-						continue	// We are a datatable parent.
-					}
-
-					if de.Current.CurrentReflect.IsPointListFlatten() {
-						// if len(de.Current.ChildReflect) > 0 {
-						// 	continue // We already have the children.
-						// }
-						if len(de.Current.ChildReflect) == 0 {
-							continue // Ignore points with no children.
-						}
-					}
-				} else {
-					if de.Hide {
-						continue	// Ignore hidden entries.
-					}
-					if de.Current.DataStructure.DataTableChild {
-						continue	// Ignore data table children.
-					}
-					// child, i := de.Current.IsTableChild()
-					// fmt.Printf("%t[%d]\n", child, i)
-					// if child {
-					// 	if !de.Current.IsTable() {
-					// 		continue
-					// 	}
-					// }
-				}
-
-				v := de.Value.String()
-				if de.Current.IsTable() {
-					v = "See table: " + de.Current.Name()
-				}
-				dm.Error = ret.AddRow(
-					de.Date.Format(valueTypes.DateTimeLayout),
-					p,
-					v,
-					// de.Value.String(),
-					de.Point.Unit,
-					de.Point.ValueType,
-					de.Point.GroupName,
-					de.Point.Description,
-					de.Point.UpdateFreq,
-				)
-				if dm.Error != nil {
-					break
-				}
-			}
-		}
-		ret.SetTitle("EndPoint Data %s", dm.StructMap.Name.String())	// endpoint.GetArea(), endpoint.GetName()
-		if dm.StructMap.Start.DataStructure.DataTableName != "" {
-			ret.SetTitle("EndPoint Data %s - %s", dm.StructMap.Name.String(), dm.StructMap.Start.DataStructure.DataTableName)	// endpoint.GetArea(), endpoint.GetName()
-		}
-		ret.SetFilePrefix(dm.StructMap.Name.String())
-		ret.SetGraphFilter("")
-		ret.Sort("Point Id")
-		if full {
-			ret.SetJson([]byte(dm.EndPoint.GetJsonData(false)))
-			ret.SetRaw([]byte(dm.EndPoint.GetJsonData(true)))
-		}
-	}
-
-	return ret
-}
-
-func (dm *DataMap) Print() {
-	for range Only.Once {
-		table := datatable.New("utf8-heavy")
-		table.AddHeaders(
-			"Index",
-			"EndPoint",
-
-			"Id",
-			"Name",
-			"Unit",
-			"Type",
-			"Value",
-			"(Value)",
-			"Valid",
-
-			"GroupName",
-			"Parent Ids",
-			"Parent Types",
-			"Parent Codes",
-		)
-
-		// dm.Order - Produces double the amount of entries for some reason.
-		i := 0
-		for k := range dm.Map {
-			for _, v := range dm.Map[k].Entries {
-				i++
-
-				table.AddRowItems(
-					i,
-					v.EndPoint,
-
-					v.Point.Id,
-					v.Point.Description,
-					v.Point.Unit,
-					v.Point.UpdateFreq,
-					v.Value,
-					v.Current.Value.First(),
-					v.Point.Valid,
-
-					v.Point.GroupName,
-					v.Point.Parents.PsIds(),
-					v.Point.Parents.Types(),
-					v.Point.Parents.Codes(),
-				)
-			}
-		}
-
-		ret, _ := table.Render()
-		fmt.Println(ret)
-	}
-}
-
-func (dm *DataMap) Sort() []string {
-	var sorted []string
-
-	for range Only.Once {
-		for p := range dm.Map {
-			sorted = append(sorted, p)
-		}
-		sort.Strings(sorted)
-	}
-	return sorted
-}
-
-
 func (dm *DataMap) StructToDataMap(endpoint EndPoint, parentDeviceId string, name GoStruct.EndPointPath) DataMap {
 	for range Only.Once {
 		epName := GoStruct.NewEndPointPath(reflection.GetName("", endpoint))
@@ -513,26 +205,6 @@ func (dm *DataMap) MakeState(refEndpoint *GoStruct.Reflect, endpoint GoStruct.En
 	return Current
 }
 
-// func (dm *DataMap) CopyDataEntries(dep DataEntries, endpoint string, pointId string, name string) *DataEntries {
-// 	var ret *DataEntries
-// 	for range Only.Once {
-// 		var des DataEntries
-// 		des = dep.Copy()
-// 		for i := range des.Entries {
-// 			des.Entries[i].SetEndpoint(endpoint, pointId)
-// 			des.Entries[i].SetPointName(name)
-// 			dm.Add(des.Entries[i])
-// 		}
-//
-// 		if len(des.Entries) == 0 {
-// 			fmt.Printf("OOOPS\n")
-// 		}
-// 		epn := des.Entries[0].EndPoint
-// 		ret = dm.Map[epn]
-// 	}
-// 	return ret
-// }
-
 func (dm *DataMap) LowerUpper(lowerEntry *GoStruct.Reflect, upperEntry *GoStruct.Reflect) float64 {
 	var ret float64
 	for range Only.Once {
@@ -599,83 +271,359 @@ func (dm *DataMap) Add(des ...DataEntry) {
 	}
 }
 
-// func (dm *DataMap) TableSort() []string {
-// 	var sorted []string
-//
-// 	for range Only.Once {
-// 		for p := range dm.DataTables {
-// 			sorted = append(sorted, p)
-// 		}
-// 		sort.Strings(sorted)
-// 	}
-// 	return sorted
-// }
+func (dm *DataMap) ProcessMap() {
+	for range Only.Once {
+		// Convert Struct.Map to DataMap
+		for _, Child := range dm.StructMap.Map {
+			if Child.IsPointIgnore() {
+				continue
+			}
 
-// func (dm *DataMap) AddAny(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, value interface{}, unit string, Type string, timeSpan string) {
-//
-// 	for range Only.Once {
-// 		var point Point
-// 		p := GetPoint(parentDeviceId + "." + pid.String())
-// 		if p == nil {
-// 			// No point found. Create one.
-// 			point = CreatePoint(parentDeviceId, pid, name, groupName, unit, Type, timeSpan)
-// 		} else {
-// 			point = *p
-// 		}
-//
-// 		uvs, isNil, ok := valueTypes.AnyToUnitValue(value, unit, Type, valueTypes.DateTimeLayout)
-// 		if !ok {
-// 			fmt.Printf("ERROR: AddAny(endpoint '%s', parentId '%s', pid '%s', name '%s', date '%s', value '%v')",
-// 				endpoint, parentDeviceId, pid, name, date, value)
-// 			break
-// 		}
-// 		if isNil {
-// 			point.ValueType += "(NIL)"
-// 		}
-//
-// 		for _, uv := range uvs {
-// 			if uv.GetUnit() != point.Unit {
-// 				fmt.Printf("OOOPS: Unit mismatch - %f %s != %f %s\n", value, point.Unit, uv.ValueFloat(), uv.GetUnit())
-// 				point.Unit = uv.GetUnit()
-// 			}
-//
-// 			var parent ParentDevice
-// 			parent.Set(parentDeviceId)
-// 			point.Parents.Add(parent)
-//
-// 			de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
-// 			de.Point = &point
-// 			dm.Add(de)
-// 		}
-// 	}
-// }
+			var when valueTypes.DateTime
+			if Child.IsPointTimestampNotZero() {
+				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
+			} else {
+				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
+			}
 
-// func (dm *DataMap) AddUnitValue(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, uv valueTypes.UnitValue, timeSpan string) {
-//
-// 	for range Only.Once {
-// 		var point Point
-// 		p := GetPoint(parentDeviceId + "." + pid.String())
-// 		if p == nil {
-// 			// No point found. Create one.
-// 			point = CreatePoint(parentDeviceId, pid, name, groupName, uv.GetUnit(), uv.Type(), timeSpan)
-// 		} else {
-// 			point = *p
-// 		}
-//
-// 		if uv.GetUnit() != point.Unit {
-// 			fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n", uv.String(), point.Unit, uv.ValueFloat(), uv.GetUnit())
-// 			point.Unit = uv.GetUnit()
-// 		}
-//
-// 		var parent ParentDevice
-// 		parent.Set(parentDeviceId)
-// 		point.Parents.Add(parent)
-//
-// 		de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
-// 		de.Point = &point
-// 		dm.Add(de)
-// 	}
-// }
+			pdi := dm.parentDeviceId
+			if Child.DataStructure.PointDevice != "" {
+				pdi = Child.DataStructure.PointDevice
+			}
+
+			dm.AddPointUnitValues(Child, pdi, when)
+		}
+
+		// Convert Struct.VirtualMap to DataMap
+		for _, Child := range dm.StructMap.VirtualMap {
+			if Child.IsPointIgnore() {
+				continue
+			}
+
+			var when valueTypes.DateTime
+			if Child.IsPointTimestampNotZero() {
+				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
+			} else {
+				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
+			}
+
+			pdi := dm.parentDeviceId
+			if Child.DataStructure.PointDevice != "" {
+				pdi = Child.DataStructure.PointDevice
+			}
+
+			if Child.DataStructure.PointVirtualShift > 0 {
+				Child.DataStructure.Endpoint.ShiftLeft(Child.DataStructure.PointVirtualShift)
+				Child.DataStructure.Endpoint.InsertFirst("virtual")
+			} else {
+				Child.DataStructure.Endpoint.ReplaceFirst("virtual")
+			}
+			dm.AddPointUnitValues(Child, pdi, when)
+		}
+	}
+}
+
+func (dm *DataMap) ProcessMapForMqtt() {
+	for range Only.Once {
+		// Convert StructMap to DataMap
+		for _, Child := range dm.StructMap.Map {
+			if Child.IsPointIgnore() {
+				fmt.Printf("[%s] - IGNORE\n", Child.FieldPath.String())
+				continue
+			}
+
+			if Child.CurrentReflect.IsPointListFlatten() {
+				// fmt.Printf("[%s] - PointListFlatten", Child.FieldPath.String())
+				// if len(de.Current.ChildReflect) > 0 {
+				// 	continue // We already have the children.
+				// }
+				if len(Child.ChildReflect) == 0 {
+					// fmt.Printf(" - IGNORE\n")
+					// fmt.Printf(" - ignore\n")
+					continue // Ignore points with no children.
+				}
+				// fmt.Println("")
+			}
+
+			if Child.DataStructure.DataTable {
+				continue	// We are a datatable parent.
+			}
+
+			var when valueTypes.DateTime
+			if Child.IsPointTimestampNotZero() {
+				when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
+			} else {
+				when = valueTypes.SetDateTimeValue(dm.TimeStamp)
+			}
+
+			pdi := dm.parentDeviceId
+			if Child.DataStructure.PointDevice != "" {
+				pdi = Child.DataStructure.PointDevice
+			}
+
+			dm.AddPointUnitValues(Child, pdi, when)
+		}
+	}
+}
+
+
+type Tables GoStruct.StructTables
+
+func (dm *DataMap) CreateDataTables() Tables {
+	tables := make(Tables, 0)
+
+	for range Only.Once {
+		for name := range dm.StructMap.TableMap {
+			var ret GoStruct.StructTable
+			dm.Error = ret.Process(name, dm.StructMap.TableMap[name])
+			_, dm.Error = ret.CreateTable()
+			tables[name] = &ret
+			// tables[name] = dm.StructMap.GetTableData(name)
+
+			// // values = make(GoStruct.StructValuesMap)
+			//
+			// td := dm.StructMap.GetTableData(name)
+			// if !td.IsValid {
+			// 	continue
+			// }
+			//
+			// values := td.GetValues()
+			// if (values == nil) || (len(values) == 0) {
+			// 	fmt.Printf("No data table results for '%s'\n", name)
+			// 	break
+			// }
+			//
+			// headers := td.GetHeaders()
+			// table := output.NewTable(headers...)
+			// for row := range values {
+			// 	var items []interface{}
+			// 	for _, col := range td.Columns {
+			// 		items = append(items, values.GetCell(row, col))
+			// 	}
+			// 	dm.Error = table.AddRow(items...)
+			// 	if dm.Error != nil {
+			// 		break
+			// 	}
+			// }
+			// if dm.Error != nil {
+			// 	break
+			// }
+			//
+			// title := td.Current.DataStructure.DataTableTitle
+			// if title == "" {
+			// 	title = td.Current.DataStructure.DataTableName
+			// }
+			// if title == "" {
+			// 	title = valueTypes.PointToName(td.Current.DataStructure.DataTableId)
+			// }
+			// // if title == "" {
+			// // 	title = valueTypes.PointToName(td.Current.DataStructure.PointId)
+			// // }
+			// // dm.EndPoint.GetRequestArgNames()
+			//
+			// table.SetName(name)
+			// if title == "" {
+			// 	table.SetTitle("DataTable %s.%s", dm.EndPoint.GetArea(), td.Name)
+			// 	table.SetFilePrefix("%s.%s", dm.EndPoint.GetArea(), td.Name)
+			// } else {
+			// 	table.SetTitle("DataTable %s.%s (%s)", dm.EndPoint.GetArea(), td.Name, title)
+			// 	table.SetFilePrefix("%s.%s-%s", dm.EndPoint.GetArea(), td.Name, td.Current.DataStructure.DataTableId)
+			// }
+			//
+			// // table.Sort(td.SortOn)
+			// table.SetJson(nil)
+			// table.SetRaw(nil)
+			//
+			// 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() {
+			// // 		val := value.GetCell(0, col)
+			// // 		if val.Type() == "DateTime" {
+			// // 			sgd.Options.GraphRequest.TimeColumn = &col
+			// // 			break
+			// // 		}
+			// // 	}
+			// // }
+			// //
+			// // if sgd.Options.GraphRequest.DataColumn == nil {
+			// // 	for _, col := range table.GetHeaders() {
+			// // 		val := value.GetCell(0, col)
+			// // 		if val.IsNumber() {
+			// // 			sgd.Options.GraphRequest.DataColumn = &col
+			// // 			break
+			// // 		}
+			// // 	}
+			// // }
+			// //
+			// // if sgd.Options.GraphRequest.ValueColumn == nil {
+			// // 	for _, col := range table.GetHeaders() {
+			// // 		val := value.GetCell(0, col)
+			// // 		if val.IsNumber() {
+			// // 			sgd.Options.GraphRequest.ValueColumn = &col
+			// // 			break
+			// // 		}
+			// // 	}
+			// // }
+			//
+			// tables[name] = Table {
+			// 	Values: values,
+			// 	Table:  table,
+			// }
+			// // values[name] = vals
+			// // tables[name] = table
+		}
+	}
+
+	return tables
+}
+
+func (dm *DataMap) CreateResultTable(full bool) output.Table {
+	var table output.Table
+
+	for range Only.Once {
+		table = output.NewTable(
+			"Date",
+			"Point Id",
+			"Value",
+			"Unit",
+			"Unit Type",
+			"Group Name",
+			"Description",
+			"Update Freq",
+		)
+
+		for _, p := range dm.Sort() {
+			entries := dm.Map[p].Entries
+			for _, de := range entries {
+				if full {
+					if de.Current.DataStructure.DataTable {
+						continue	// We are a datatable parent.
+					}
+
+					if de.Current.CurrentReflect.IsPointListFlatten() {
+						// if len(de.Current.ChildReflect) > 0 {
+						// 	continue // We already have the children.
+						// }
+						if len(de.Current.ChildReflect) == 0 {
+							continue // Ignore points with no children.
+						}
+					}
+				} else {
+					if de.Hide {
+						continue	// Ignore hidden entries.
+					}
+					if de.Current.DataStructure.DataTableChild {
+						continue	// Ignore data table children.
+					}
+					// child, i := de.Current.IsTableChild()
+					// fmt.Printf("%t[%d]\n", child, i)
+					// if child {
+					// 	if !de.Current.IsTable() {
+					// 		continue
+					// 	}
+					// }
+				}
+
+				v := de.Value.String()
+				if de.Current.IsTable() {
+					v = "See table: " + de.Current.Name()
+				}
+				dm.Error = table.AddRow(
+					de.Date.Format(valueTypes.DateTimeLayout),
+					p,
+					v,
+					// de.Value.String(),
+					de.Point.Unit,
+					de.Point.ValueType,
+					de.Point.GroupName,
+					de.Point.Description,
+					de.Point.UpdateFreq,
+				)
+				if dm.Error != nil {
+					break
+				}
+			}
+		}
+		table.SetTitle("EndPoint Data %s.%s", dm.EndPoint.GetArea(), dm.StructMap.Name.String()) // endpoint.GetArea(), endpoint.GetName()
+		if dm.StructMap.Start.DataStructure.DataTableName != "" {
+			table.AppendTitle(" - %s", dm.StructMap.Start.DataStructure.DataTableName)
+		}
+		table.SetFilePrefix("%s.%s", dm.EndPoint.GetArea(), dm.StructMap.Name.String())
+		table.SetGraphFilter("")
+		table.Sort("Point Id")
+		if full {
+			table.SetJson([]byte(dm.EndPoint.GetJsonData(false)))
+			table.SetRaw([]byte(dm.EndPoint.GetJsonData(true)))
+		}
+	}
+
+	return table
+}
+
+func (dm *DataMap) Print() {
+	for range Only.Once {
+		table := datatable.New("utf8-heavy")
+		table.AddHeaders(
+			"Index",
+			"EndPoint",
+
+			"Id",
+			"Name",
+			"Unit",
+			"Type",
+			"Value",
+			"(Value)",
+			"Valid",
+
+			"GroupName",
+			"Parent Ids",
+			"Parent Types",
+			"Parent Codes",
+		)
+
+		// dm.Order - Produces double the amount of entries for some reason.
+		i := 0
+		for k := range dm.Map {
+			for _, v := range dm.Map[k].Entries {
+				i++
+
+				table.AddRowItems(
+					i,
+					v.EndPoint,
+
+					v.Point.Id,
+					v.Point.Description,
+					v.Point.Unit,
+					v.Point.UpdateFreq,
+					v.Value,
+					v.Current.Value.First(),
+					v.Point.Valid,
+
+					v.Point.GroupName,
+					v.Point.Parents.PsIds(),
+					v.Point.Parents.Types(),
+					v.Point.Parents.Codes(),
+				)
+			}
+		}
+
+		ret, _ := table.Render()
+		fmt.Println(ret)
+	}
+}
+
+func (dm *DataMap) Sort() []string {
+	var sorted []string
+
+	for range Only.Once {
+		for p := range dm.Map {
+			sorted = append(sorted, p)
+		}
+		sort.Strings(sorted)
+	}
+	return sorted
+}
 
 
 func CreatePointDataEntry(Current *GoStruct.Reflect, parentDeviceId string, point Point, dateTime valueTypes.DateTime, uv valueTypes.UnitValue) DataEntry {
diff --git a/iSolarCloud/data.go b/iSolarCloud/data.go
index 52dcdcbb1..87b1d30e1 100644
--- a/iSolarCloud/data.go
+++ b/iSolarCloud/data.go
@@ -191,12 +191,29 @@ func (sgd *SunGrowData) CallEndpoint(endpoint api.EndPoint, request SunGrowDataR
 		}
 
 		response.Data = endpoint.GetEndPointData()
-		response.Name = endpoint.GetName().String()
-		// response.Data.Table.AppendFilePrefix(request.RequestAsFilePrefix())		// request.GetFilename(endpoint.GetName().String()))
-		// response.Data.Table.SetSaveFile(sgd.saveAsFile)
-		// response.Data.Table.OutputType = sgd.outputType
-		// response.Title = response.Data.Table.GetTitle()
-		// response.Filename = response.Data.Table.GetFilePrefix()
+		args := request.GetArgs(response.Data.EndPoint)
+		name := endpoint.GetArea().String() + "." + endpoint.GetName().String()
+
+		response.Options = OutputOptions {
+			Name:        endpoint.GetName().String(),
+			OutputType:  sgd.sunGrow.OutputType,
+			FileSuffix:  request.GetPrimaryArg(), // + " - " + request.RequestAsFilePrefix(),
+			SaveAsFile:  sgd.sunGrow.SaveAsFile,
+			TitleSuffix: args,
+			GraphRequest: output.GraphRequest {
+				Title:       name + " - " + args,
+				TimeColumn:  nil,
+				DataColumn:  nil,
+				UnitsColumn: nil,
+				NameColumn:  nil,
+				// DataColumn:   nil,
+				DataMin: nil,
+				DataMax: nil,
+				Width:   nil,
+				Height:  nil,
+				Error:   nil,
+			},
+		}
 	}
 
 	return response
@@ -223,6 +240,7 @@ func (sgd *SunGrowData) GetData() error {
 			if sgd.Request.IsPsIdNotRequired() {
 				var result SunGrowDataResult
 
+				result.EndPointArea = ep.GetArea()
 				result.EndPointName = ep.GetName()
 				result.EndPoint = ep
 				result.Request = sgd.Request
@@ -242,10 +260,10 @@ func (sgd *SunGrowData) GetData() error {
 			// PsId required.
 			for _, psId := range sgd.Request.aPsId {
 				var result SunGrowDataResult
-
 				result.Request = sgd.Request
 				result.Request.SetPsId(psId.String())
 
+				result.EndPointArea = ep.GetArea()
 				result.EndPointName = ep.GetName()
 				result.EndPoint = ep
 				result.Response = sgd.CallEndpoint(ep, result.Request)
@@ -264,7 +282,6 @@ func (sgd *SunGrowData) GetData() error {
 	return sgd.Error
 }
 
-
 func (sgd *SunGrowData) Process() error {
 	for range Only.Once {
 		if len(sgd.Results) == 0 {
@@ -291,10 +308,7 @@ func (sgd *SunGrowData) Output() error {
 		}
 
 		for _, result := range sgd.Results {
-			args := result.Request.GetArgs(result.EndPoint)
-			result.Response.Filename = result.Request.RequestAsFilePrefix()
-			result.Response.Title = result.EndPoint.GetArea().String() + "." + result.EndPoint.GetName().String() + " - " + args
-			sgd.Error = result.Response.Output(sgd.sunGrow.OutputType, sgd.sunGrow.SaveAsFile)
+			sgd.Error = result.Response.Output()
 			if sgd.Error != nil {
 				break
 			}
@@ -303,43 +317,6 @@ func (sgd *SunGrowData) Output() error {
 
 	return sgd.Error
 }
-func (sgd *SunGrowDataResult) Output(outputType output.OutputType, saveAsFile bool, filePrefix string) error {
-	sgd.Response.Filename = filePrefix
-	sgd.Error = sgd.Response.Output(outputType, saveAsFile)
-	return sgd.Error
-}
-func (sgd *SunGrowDataResponse) Output(outputType output.OutputType, saveAsFile bool) error {
-	for range Only.Once {
-		// Outputs that don't drop through.
-		if outputType.IsStruct() || outputType.IsList() || outputType.IsRaw() || outputType.IsJson() {
-			table := sgd.Data.CreateResultTable(true)
-			table.OutputType = outputType
-			table.SetSaveFile(saveAsFile)
-			table.AppendFilePrefix(sgd.Filename)
-			table.SetTitle(table.GetName() + " - " + sgd.Title)
-			sgd.Error = table.Output()
-			break
-		}
-
-		// Outputs that can drop through to DataTables.
-		if outputType.IsTable() || outputType.IsXLSX() || outputType.IsCsv() || outputType.IsXML() {
-			table := sgd.Data.CreateResultTable(false)
-			table.OutputType = outputType
-			table.SetSaveFile(saveAsFile)
-			table.AppendFilePrefix(sgd.Filename)
-			table.SetTitle(table.GetName() + " - " + sgd.Title)
-			sgd.Error = table.Output()
-			if sgd.Error != nil {
-				break
-			}
-			// break
-		}
-
-		sgd.Error = sgd.OutputDataTables(outputType, saveAsFile)
-	}
-
-	return sgd.Error
-}
 
 func (sgd *SunGrowData) OutputDataTables() error {
 	for range Only.Once {
@@ -349,10 +326,7 @@ func (sgd *SunGrowData) OutputDataTables() error {
 		}
 
 		for _, result := range sgd.Results {
-			args := result.Request.GetArgs(result.EndPoint)
-			result.Response.Filename = result.Request.RequestAsFilePrefix()
-			result.Response.Title = result.EndPoint.GetArea().String() + "." + result.EndPoint.GetName().String() + " - " + args
-			sgd.Error = result.OutputDataTables(sgd.sunGrow.OutputType, sgd.sunGrow.SaveAsFile)
+			sgd.Error = result.Response.OutputDataTables()
 			if sgd.Error != nil {
 				break
 			}
@@ -361,40 +335,11 @@ func (sgd *SunGrowData) OutputDataTables() error {
 
 	return sgd.Error
 }
-func (sgd *SunGrowDataResult) OutputDataTables(outputType output.OutputType, saveAsFile bool) error {
-	sgd.Error = sgd.Response.OutputDataTables(outputType, saveAsFile)
-	return sgd.Error
-}
-func (sgd *SunGrowDataResponse) OutputDataTables(outputType output.OutputType, saveAsFile bool) error {
-	for range Only.Once {
-		tables := sgd.Data.CreateDataTables()
-		if len(tables) == 0 {
-			break
-		}
-
-		for _, table := range tables {
-			fmt.Println()
-			table.OutputType = outputType
-			table.SetSaveFile(saveAsFile)
-			table.AppendFilePrefix(sgd.Filename)
-			table.SetTitle(table.GetName() + " - " + sgd.Title)
-			sgd.Error = table.Output()
-			if sgd.Error != nil {
-				break
-			}
-		}
-	}
-
-	return sgd.Error
-}
-
-// func (sgd *SunGrowData) GetResults() SunGrowDataResults {
-// 	return sgd.Results
-// }
 
 
 type SunGrowDataResults map[string]SunGrowDataResult
 type SunGrowDataResult struct {
+	EndPointArea api.AreaName
 	EndPointName api.EndPointName
 	EndPoint     api.EndPoint
 	Request      SunGrowDataRequest
@@ -420,21 +365,11 @@ func (sgd *SunGrowDataResult) CreateResultTable(full bool) output.Table {
 	sgd.Error = sgd.Response.Data.Error
 	return ret
 }
-func (sgd *SunGrowDataResponse) CreateResultTable(full bool) output.Table {
-	ret := sgd.Data.CreateResultTable(full)
-	sgd.Error = sgd.Data.Error
-	return ret
-}
 
-func (sgd *SunGrowDataResult) CreateDataTables() output.Tables {
-	ret := sgd.Response.Data.CreateDataTables()
+func (sgd *SunGrowDataResult) CreateDataTables() api.Tables {
+	tables := sgd.Response.CreateDataTables()
 	sgd.Error = sgd.Response.Data.Error
-	return ret
-}
-func (sgd *SunGrowDataResponse) CreateDataTables() output.Tables {
-	ret := sgd.Data.CreateDataTables()
-	sgd.Error = sgd.Data.Error
-	return ret
+	return tables
 }
 
 func (sgd *SunGrowDataResult) Sort() []string {
@@ -444,17 +379,204 @@ func (sgd *SunGrowDataResult) Sort() []string {
 func (sgd *SunGrowDataResult) Print() {
 	sgd.Response.Data.Print()
 }
+
+
+type OutputOptions struct {
+	Name        string
+	TitleSuffix string
+	OutputType output.OutputType
+	FileSuffix string
+	SaveAsFile bool
+	GraphRequest output.GraphRequest
+
+	// table.InitGraph(output.GraphRequest {
+	// 	Title:        "",
+	// 	TimeColumn:   output.SetString("Date/Time"),
+	// 	SearchColumn: output.SetString("Point Id"),
+	// 	NameColumn:   output.SetString("Point Name"),
+	// 	ValueColumn:  output.SetString("Value"),
+	// 	UnitsColumn:  output.SetString("Units"),
+	// 	SearchString: output.SetString(""),
+	// 	MinLeftAxis:  output.SetFloat(0),
+	// 	MaxLeftAxis:  output.SetFloat(0),
+	// })
+}
+
+type SunGrowDataResponses map[string]SunGrowDataResponse
+type SunGrowDataFunction func(request SunGrowDataRequest) SunGrowDataResponse
+type SunGrowDataResponse struct {
+	Data     api.DataMap
+	Options  OutputOptions
+	Error    error
+}
+
+func (sgd *SunGrowDataResponse) CreateResultTable(full bool) output.Table {
+	ret := sgd.Data.CreateResultTable(full)
+	sgd.Error = sgd.Data.Error
+	return ret
+}
+
+func (sgd *SunGrowDataResponse) CreateDataTables() api.Tables {
+	tables := sgd.Data.CreateDataTables()
+	sgd.Error = sgd.Data.Error
+	return tables
+}
+
+func (sgd *SunGrowDataResponse) Output() error {
+	for range Only.Once {
+		// Outputs that don't drop through.
+		if sgd.Options.OutputType.IsStruct() || sgd.Options.OutputType.IsList() || sgd.Options.OutputType.IsRaw() || sgd.Options.OutputType.IsJson() {
+			table := sgd.Data.CreateResultTable(true)
+			table.OutputType = sgd.Options.OutputType
+			table.SetSaveFile(sgd.Options.SaveAsFile)
+			table.AppendTitle(" - %s", sgd.Options.TitleSuffix)
+			table.AppendFilePrefix(sgd.Options.FileSuffix)
+			sgd.Error = table.Output()
+			break
+		}
+
+		// Outputs that can drop through to DataTables.
+		if sgd.Options.OutputType.IsTable() || sgd.Options.OutputType.IsXLSX() || sgd.Options.OutputType.IsCsv() || sgd.Options.OutputType.IsXML() {
+			table := sgd.Data.CreateResultTable(false)
+			table.OutputType = sgd.Options.OutputType
+			table.SetSaveFile(sgd.Options.SaveAsFile)
+			table.AppendTitle(" - %s", sgd.Options.TitleSuffix)
+			table.AppendFilePrefix(sgd.Options.FileSuffix)
+			sgd.Error = table.Output()
+			if sgd.Error != nil {
+				break
+			}
+			// break
+		}
+
+		sgd.Error = sgd.OutputDataTables()
+	}
+
+	return sgd.Error
+}
+
+func (sgd *SunGrowDataResponse) OutputDataTables() error {
+	for range Only.Once {
+		tables := sgd.Data.CreateDataTables()
+		if len(tables) == 0 {
+			break
+		}
+
+		// @iSolarCloud/api/struct_data.go:420
+		if sgd.Options.OutputType.IsGraph() {
+			for _, data := range tables {
+				// table := tables[name]
+				// table.OutputType = sgd.Options.OutputType
+				// table.SetSaveFile(sgd.Options.SaveAsFile)
+				// table.SetFilePrefix("%s", sgd.Options.Filename)
+
+				// value := values[name]
+				// fmt.Printf("Writing (%d)\n", len(value))
+				// fmt.Printf("%v\n", table.GetHeaders())
+
+				if sgd.Options.TitleSuffix == "" {
+					sgd.Options.TitleSuffix = data.Table.GetTitle()
+				}
+				data.Table.OutputType = sgd.Options.OutputType
+				data.Table.SetSaveFile(true)
+				data.Table.AppendTitle(" - %s", sgd.Options.TitleSuffix)
+				data.Table.AppendFilePrefix(sgd.Options.FileSuffix)
+
+				if sgd.Options.GraphRequest.TimeColumn == nil {
+					for _, col := range data.Table.GetHeaders() {
+						val := data.Values.GetCell(0, col)
+						if val.IsTypeDateTime() {
+							sgd.Options.GraphRequest.TimeColumn = &col
+							break
+						}
+					}
+				}
+
+				// if sgd.Options.GraphRequest.DataColumn == nil {
+				// 	for _, col := range data.Table.GetHeaders() {
+				// 		val := data.Values.GetCell(0, col)
+				// 		if val.IsNumber() {
+				// 			sgd.Options.GraphRequest.DataColumn = &col
+				// 			break
+				// 		}
+				// 	}
+				// }
+
+				if sgd.Options.GraphRequest.DataColumn == nil {
+					for _, col := range data.Table.GetHeaders() {
+						val := data.Values.GetCell(0, col)
+						if val.IsNumber() {
+							sgd.Options.GraphRequest.DataColumn = &col
+							break
+						}
+					}
+				}
+
+				if sgd.Options.GraphRequest.UnitsColumn != nil {
+					for _, col := range data.Table.GetHeaders() {
+						if *sgd.Options.GraphRequest.UnitsColumn != col {
+							continue
+						}
+						val := data.Values.GetCell(0, col)
+						unit := val.Unit()
+						if unit != "" {
+							continue
+						}
+						sgd.Options.GraphRequest.UnitsColumn = &col
+						sgd.Options.GraphRequest.DataUnit = &unit
+						break
+					}
+				}
+
+				if sgd.Options.GraphRequest.NameColumn == nil {
+				}
+
+				if sgd.Options.GraphRequest.DataMin == nil {
+					zero := 0.0
+					sgd.Options.GraphRequest.DataMin = &zero
+				}
+
+				if sgd.Options.GraphRequest.DataMax == nil {
+					zero := 0.0
+					sgd.Options.GraphRequest.DataMax = &zero
+				}
+
+				if sgd.Options.GraphRequest.Width == nil {
+				}
+
+				if sgd.Options.GraphRequest.Height == nil {
+				}
+
+				sgd.Error = data.Table.SetGraph(sgd.Options.GraphRequest)
+				if sgd.Error != nil {
+					break
+				}
+
+				sgd.Error = data.Table.Output()
+				if sgd.Error != nil {
+					break
+				}
+			}
+			break
+		}
+
+		for _, data := range tables {
+			fmt.Println()
+			data.Table.OutputType = sgd.Options.OutputType
+			data.Table.SetSaveFile(sgd.Options.SaveAsFile)
+			data.Table.AppendTitle(" - %s", sgd.Options.TitleSuffix)
+			data.Table.AppendFilePrefix(sgd.Options.FileSuffix)
+
+			sgd.Error = data.Table.Output()
+			if sgd.Error != nil {
+				break
+			}
+		}
+	}
+
+	return sgd.Error
+}
+
 func (sgd *SunGrowDataResponse) Print() {
 	sgd.Data.Print()
 }
-
-
-type SunGrowDataResponse struct {
-	Data     api.DataMap
-	Name     string
-	Filename string
-	Title    string
-	Error    error
-}
-type SunGrowDataResponses map[string]SunGrowDataResponse
-type SunGrowDataFunction func(request SunGrowDataRequest) SunGrowDataResponse
diff --git a/iSolarCloud/data_request.go b/iSolarCloud/data_request.go
index f57624ad2..da3c21a5d 100644
--- a/iSolarCloud/data_request.go
+++ b/iSolarCloud/data_request.go
@@ -962,12 +962,15 @@ func (sgd *SunGrowDataRequest) IsRequiredAndNotSet(arg string) bool {
 	var yes bool
 	for range Only.Once {
 		if _, ok := sgd.Required[arg]; !ok {
+			yes = false
 			break
 		}
 		if sgd.IsNotRequired(arg) {
+			yes = false
 			break
 		}
 		if sgd.IsSet(arg) {
+			yes = false
 			break
 		}
 		yes = true
@@ -976,7 +979,59 @@ func (sgd *SunGrowDataRequest) IsRequiredAndNotSet(arg string) bool {
 }
 
 func (sgd *SunGrowDataRequest) IsRequiredAndSet(arg string) bool {
-	return !sgd.IsRequiredAndNotSet(arg)
+	var yes bool
+	for range Only.Once {
+		if _, ok := sgd.Required[arg]; !ok {
+			yes = false
+			break
+		}
+		if sgd.IsNotRequired(arg) {
+			yes = false
+			break
+		}
+		if sgd.IsNotSet(arg) {
+			yes = false
+			break
+		}
+		yes = true
+	}
+	return yes
+}
+
+// GetPrimaryArg - Fetch the primary arg that's set. Typically used in filename generation.
+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)
+		}
+	}
+	return yes
 }
 
 func (sgd *SunGrowDataRequest) SetIfRequired(arg string, value string) {