From fa85548f5dea359c4887e8d9e5595b0e8912f8fa Mon Sep 17 00:00:00 2001
From: MickMake <github@mickmake.com>
Date: Tue, 11 Oct 2022 01:29:49 +1100
Subject: [PATCH] v2.3.1 - Added more endpoints

---
 .idea/workspace.xml                           |  89 +++---
 cmd/cmd_api.go                                |  19 +-
 iSolarCloud/AppService/findPsType/data.go     |   2 +-
 iSolarCloud/AppService/getAreaList/data.go    |   6 +-
 iSolarCloud/AppService/getDeviceList/data.go  |  34 +--
 .../AppService/getDeviceModelInfoList/data.go |   2 +-
 .../AppService/getDeviceTypeInfoList/data.go  |   4 +-
 .../AppService/getDeviceTypeList/data.go      |   2 +-
 .../getFaultMsgListWithYYYYMM/data.go         |   6 +-
 .../getHouseholdStoragePsReport/data.go       | 272 +++++++++---------
 .../AppService/getIncomeSettingInfos/data.go  |   2 +-
 .../AppService/getModuleLogTaskList/data.go   |  30 +-
 iSolarCloud/AppService/getOSSConfig/data.go   |  19 +-
 .../AppService/getOrgListByName/data.go       |   6 +-
 .../AppService/getOrgListForUser/data.go      |   7 +-
 .../getPowerChargeSettingInfo/data.go         |   2 +-
 .../getPowerStationBasicInfo/data.go          |   2 +-
 .../getPowerStationForHousehold/data.go       | 219 +++++++-------
 .../AppService/getPowerStationInfo/data.go    |   2 +-
 .../AppService/getPowerStatistics/data.go     |   2 +-
 iSolarCloud/AppService/getPsDetail/data.go    | 126 ++++----
 .../AppService/getPsDetailWithPsType/data.go  |  82 +++---
 .../AppService/getPsHealthState/data.go       |   3 +-
 iSolarCloud/AppService/getPsList/data.go      |  72 ++---
 .../AppService/getPsListByName/data.go        |   6 +-
 .../AppService/getPsListStaticData/data.go    |   6 +-
 iSolarCloud/AppService/getPsReport/data.go    |  26 +-
 iSolarCloud/AppService/getPsUser/data.go      | 120 ++++----
 .../AppService/getPsWeatherList/data.go       |   3 +-
 .../AppService/getRegionalTree/data.go        |  31 +-
 .../getRemoteUpgradeDeviceList/data.go        |  24 +-
 iSolarCloud/AppService/getReportData/data.go  | 242 +++++++++++++++-
 .../getReportEmailConfigInfo/data.go          |  40 ++-
 iSolarCloud/AppService/getSerialNum/data.go   |   2 +-
 .../AppService/getStationInfoSql/data.go      |   2 +-
 iSolarCloud/AppService/getSysMsg/data.go      |  70 ++++-
 .../AppService/getTemplateList/data.go        |  19 +-
 iSolarCloud/AppService/getUpTimePoint/data.go |  25 +-
 .../AppService/getUserPsOrderList/data.go     |   2 +-
 iSolarCloud/AppService/listOssFiles/data.go   |  19 +-
 iSolarCloud/AppService/login/data.go          |  42 +--
 iSolarCloud/AppService/psForcastInfo/data.go  |  49 +++-
 .../AppService/queryDeviceInfo/data.go        | 113 +++++++-
 .../AppService/queryDeviceInfoForApp/data.go  | 111 ++++++-
 .../AppService/queryDeviceList/data.go        |   6 +-
 .../AppService/queryDeviceListForApp/data.go  |  90 +++---
 .../AppService/queryMutiPointDataList/data.go |   2 +-
 .../AppService/queryPowerStationInfo/data.go  |  24 +-
 iSolarCloud/AppService/queryPsProfit/data.go  |   2 +-
 iSolarCloud/AppService/queryUnitList/data.go  |   6 +-
 iSolarCloud/AppService/reportList/data.go     |   2 +-
 .../WebAppService/getDeviceUuid/data.go       |   3 +-
 iSolarCloud/WebAppService/showPSView/data.go  |   4 +-
 iSolarCloud/api/datetime.go                   |   9 +-
 iSolarCloud/api/types.go                      | 138 +++++++++
 iSolarCloud/highlevel.go                      |   6 +-
 iSolarCloud/struct.go                         |  24 +-
 57 files changed, 1437 insertions(+), 841 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5b9cc7767..c4f154fef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,85 +6,62 @@
   <component name="ChangeListManager">
     <list default="true" id="76adadc9-ae71-42a6-82a1-66dbc8ecb14c" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/cmd.go" beforeDir="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$/cmd/const.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_config.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_cron.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_git.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_google.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_help.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_help_const.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cmd_version.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/cobra.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/delete/viper.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/flags.go" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmd/struct.go" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmd/cmd_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/cmd_api.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/getAllPowerDeviceSetName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerDeviceSetName/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/getCloudList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getCloudList/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/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/getFaultCount/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getFaultCount/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/getHouseholdStoragePsReport/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdStoragePsReport/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/getInstallerInfoByDealerOrgCodeOrId/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/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/getModuleLogTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getModuleLogTaskList/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/getOSSConfig/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getOSSConfig/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/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/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/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/getPsDataSupplementTaskList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDataSupplementTaskList/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/getPsDetail/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsDetail/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/getPsList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getPsList/data.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/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/getRemoteUpgradeSubTasksList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/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/getRegionalTree/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getRegionalTree/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/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/getSerialNum/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSerialNum/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/getSysMsg/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getSysMsg/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/getUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserList/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/getUserPsOrderList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/getUserPsOrderList/data.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/AppService/login/auth.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/login/auth.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/login/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/login/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/queryAllPsIdAndName/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryAllPsIdAndName/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/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/queryMutiPointDataList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryMutiPointDataList/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/queryPsProfit/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryPsProfit/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/queryUserList/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/AppService/queryUserList/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/WebAppService/queryUserCurveTemplateData/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/queryUserCurveTemplateData/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/showPSView/data.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/WebAppService/showPSView/data.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/iSolarCloud/api/datetime.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/datetime.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/file.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/file.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/api/types.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/types.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/utils.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/utils.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/iSolarCloud/api/web.go" beforeDir="false" afterPath="$PROJECT_DIR$/iSolarCloud/api/web.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" />
-      <change beforePath="$PROJECT_DIR$/mmHa/struct.go" beforeDir="false" afterPath="$PROJECT_DIR$/mmHa/struct.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -155,7 +132,6 @@
     <configuration name="GoSungrow" type="GoApplicationRunConfiguration" factoryName="Go Application">
       <module name="GoSungrow" />
       <working_directory value="$PROJECT_DIR$" />
-      <parameters value="data get stats" />
       <kind value="PACKAGE" />
       <package value="GoSungrow" />
       <directory value="$PROJECT_DIR$" />
@@ -514,11 +490,6 @@
           <line>905</line>
           <option name="timeStamp" value="1237" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/struct.go</url>
-          <line>169</line>
-          <option name="timeStamp" value="1244" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/AppService/getPsDetail/data.go</url>
           <line>295</line>
@@ -531,14 +502,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/datetime.go</url>
-          <line>133</line>
+          <line>128</line>
           <option name="timeStamp" value="1331" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/iSolarCloud/struct.go</url>
-          <line>127</line>
-          <option name="timeStamp" value="1349" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
           <url>file://$PROJECT_DIR$/iSolarCloud/api/file.go</url>
           <line>155</line>
@@ -589,6 +555,21 @@
           <line>797</line>
           <option name="timeStamp" value="1395" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/cmd/cmd_api.go</url>
+          <line>411</line>
+          <option name="timeStamp" value="1401" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/struct.go</url>
+          <line>123</line>
+          <option name="timeStamp" value="1402" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go</url>
+          <line>374</line>
+          <option name="timeStamp" value="1411" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
diff --git a/cmd/cmd_api.go b/cmd/cmd_api.go
index 64ee96e2d..bcb4cf1f8 100644
--- a/cmd/cmd_api.go
+++ b/cmd/cmd_api.go
@@ -297,20 +297,6 @@ func (ca *Cmds) SunGrowArgs(_ *cobra.Command, _ []string) error {
 		}
 
 		ca.Api.SunGrow.SetOutputType(ca.Api.OutputType)
-		// switch ca.ApiOutputType {
-		// 	case output.StringTypeJson:
-		// 		ca.Api.SunGrow.OutputType.SetJson()
-		// 	case output.StringTypeCsv:
-		// 		ca.Api.SunGrow.OutputType.SetCsv()
-		// 	case output.StringTypeRaw:
-		// 		ca.Api.SunGrow.OutputType.SetRaw()
-		// 	case output.StringTypeGraph:
-		// 		ca.Api.SunGrow.OutputType.SetGraph()
-		// 	case output.StringTypeTable:
-		// 		fallthrough
-		// 	default:
-		// 		ca.Api.SunGrow.OutputType.SetTable()
-		// }
 		ca.Api.SunGrow.SaveAsFile = ca.Api.SaveFile
 
 		if ca.Api.AppKey == "" {
@@ -422,8 +408,11 @@ func (c *CmdApi) CmdApiGet(_ *cobra.Command, args []string) error {
 			c.Error = c.SunGrow.AllCritical()
 			break
 		}
-
 		ep := c.SunGrow.GetByJson(args[0], args[1])
+		if ep.IsError() {
+			c.Error = ep.GetError()
+			break
+		}
 		if c.SunGrow.Error != nil {
 			c.Error = c.SunGrow.Error
 			break
diff --git a/iSolarCloud/AppService/findPsType/data.go b/iSolarCloud/AppService/findPsType/data.go
index 1769342b9..4c017fb66 100644
--- a/iSolarCloud/AppService/findPsType/data.go
+++ b/iSolarCloud/AppService/findPsType/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/findPsType"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getAreaList/data.go b/iSolarCloud/AppService/getAreaList/data.go
index 62d0c63c8..62241ef65 100644
--- a/iSolarCloud/AppService/getAreaList/data.go
+++ b/iSolarCloud/AppService/getAreaList/data.go
@@ -24,10 +24,10 @@ func (rd RequestData) Help() string {
 type ResultData struct {
 	PageList []struct {
 		FaultStationCount api.Integer   `json:"fault_station_count"`
-		IsHaveEsPs        string        `json:"is_have_es_ps"`
-		IsLeaf            api.Integer   `json:"is_leaf"`
+		IsHaveEsPs        api.Bool      `json:"is_have_es_ps"`
+		IsLeaf            api.Bool      `json:"is_leaf"`
 		OrgID             api.Integer   `json:"org_id"`
-		OrgName           string        `json:"org_name"`
+		OrgName           api.String    `json:"org_name"`
 		P83048            api.UnitValue `json:"p83048"`
 		P83049            api.UnitValue `json:"p83049"`
 		P83050            api.UnitValue `json:"p83050"`
diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go
index a6f95eaf8..21598c6a5 100644
--- a/iSolarCloud/AppService/getDeviceList/data.go
+++ b/iSolarCloud/AppService/getDeviceList/data.go
@@ -38,37 +38,37 @@ type ResultData struct {
 		DeviceCode              api.Integer `json:"device_code"`
 		DeviceFactoryDate       interface{} `json:"device_factory_date"`
 		DeviceID                api.Integer `json:"device_id"`
-		DeviceModel             string      `json:"device_model"`
-		DeviceModelCode         string      `json:"device_model_code"`
+		DeviceModel             api.String  `json:"device_model"`
+		DeviceModelCode         api.String  `json:"device_model_code"`
 		DeviceModelID           api.Integer `json:"device_model_id"`
-		DeviceName              string      `json:"device_name"`
-		DeviceProSn             string      `json:"device_pro_sn"`
+		DeviceName              api.String  `json:"device_name"`
+		DeviceProSn             api.String  `json:"device_pro_sn"`
 		DeviceState             string      `json:"device_state"`
 		DeviceSubType           interface{} `json:"device_sub_type"`
 		DeviceSubTypeName       interface{} `json:"device_sub_type_name"`
 		DeviceType              api.Integer `json:"device_type"`
-		FactoryName             string      `json:"factory_name"`
+		FactoryName             api.String  `json:"factory_name"`
 		InstallerDevFaultStatus string      `json:"installer_dev_fault_status"`
 		InverterModelType       api.Integer `json:"inverter_model_type"`
-		IsCountryCheck          api.Integer `json:"is_country_check"`
-		IsHasFunctionEnum       api.Integer `json:"is_has_function_enum"`
-		IsHasTheAbility         api.Integer `json:"is_has_the_ability"`
-		IsInit                  api.Integer `json:"is_init"`
-		IsReadSet               api.Integer `json:"is_read_set"`
-		IsReplacing             api.Integer `json:"is_replacing"`
-		IsReset                 api.Integer `json:"is_reset"`
-		IsSecond                api.Integer `json:"is_second"`
-		IsThirdParty            api.Integer `json:"is_third_party"`
+		IsCountryCheck          api.Bool    `json:"is_country_check"`
+		IsHasFunctionEnum       api.Bool    `json:"is_has_function_enum"`
+		IsHasTheAbility         api.Bool    `json:"is_has_the_ability"`
+		IsInit                  api.Bool    `json:"is_init"`
+		IsReadSet               api.Bool    `json:"is_read_set"`
+		IsReplacing             api.Bool    `json:"is_replacing"`
+		IsReset                 api.Bool    `json:"is_reset"`
+		IsSecond                api.Bool    `json:"is_second"`
+		IsThirdParty            api.Bool    `json:"is_third_party"`
 		ModuleUUID              api.Integer `json:"module_uuid"`
 		OwnerDevFaultStatus     string      `json:"owner_dev_fault_status"`
 		P24                     interface{} `json:"p24"`
 		Posx                    interface{} `json:"posx"`
 		Posy                    interface{} `json:"posy"`
 		PsID                    api.Integer `json:"ps_id"`
-		PsKey                   string      `json:"ps_key"`
+		PsKey                   api.PsKey   `json:"ps_key"`
 		RelState                api.Integer `json:"rel_state"`
-		Sn                      string      `json:"sn"`
-		TypeName                string      `json:"type_name"`
+		Sn                      api.String  `json:"sn"`
+		TypeName                api.String  `json:"type_name"`
 		UUID                    api.Integer `json:"uuid"`
 	} `json:"pageList"`
 	RowCount api.Integer `json:"rowCount"`
diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/data.go b/iSolarCloud/AppService/getDeviceModelInfoList/data.go
index e466f2f3f..f292e61ee 100644
--- a/iSolarCloud/AppService/getDeviceModelInfoList/data.go
+++ b/iSolarCloud/AppService/getDeviceModelInfoList/data.go
@@ -32,7 +32,7 @@ type ResultData []struct {
 	DeviceModelCode   string `json:"device_model_code"`
 	DeviceModelID     api.Integer  `json:"device_model_id"`
 	DeviceType        api.Integer  `json:"device_type"`
-	IsRemoteUpgrade   api.Integer  `json:"is_remote_upgrade"`
+	IsRemoteUpgrade   api.Bool     `json:"is_remote_upgrade"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
index 210b5e097..be74569f2 100644
--- a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
+++ b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
@@ -23,9 +23,9 @@ func (rd RequestData) Help() string {
 
 type ResultData []struct {
 	DeviceType      api.Integer  `json:"device_type"`
-	IsRemoteUpgrade api.Integer  `json:"is_remote_upgrade"`
+	IsRemoteUpgrade api.Bool     `json:"is_remote_upgrade"`
 	TypeCode        api.Integer  `json:"type_code"`
-	TypeName        string `json:"type_name"`
+	TypeName        api.String   `json:"type_name"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getDeviceTypeList/data.go b/iSolarCloud/AppService/getDeviceTypeList/data.go
index c4362978a..0c876aeb6 100644
--- a/iSolarCloud/AppService/getDeviceTypeList/data.go
+++ b/iSolarCloud/AppService/getDeviceTypeList/data.go
@@ -25,7 +25,7 @@ type ResultData struct {
 	DeviceTypeList []struct {
 		DevListOrderID api.Integer  `json:"dev_list_order_id"`
 		DeviceType     api.Integer  `json:"device_type"`
-		TypeName       string `json:"type_name"`
+		TypeName       api.String   `json:"type_name"`
 	} `json:"deviceTypeList"`
 }
 
diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
index c492d97e7..bcae90f0a 100644
--- a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
+++ b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
@@ -25,14 +25,14 @@ func (rd RequestData) Help() string {
 
 type ResultData   []struct {
 	CreateTime    api.Integer  `json:"create_time"`
-	FaultCode     string `json:"fault_code"`
+	FaultCode     api.String   `json:"fault_code"`
 	FaultLevel    api.Integer  `json:"fault_level"`
-	FaultReason   string `json:"fault_reason"`
+	FaultReason   api.String   `json:"fault_reason"`
 	FaultType     api.Integer  `json:"fault_type"`
 	FaultTypeCode api.Integer  `json:"fault_type_code"`
 	ID            api.Integer  `json:"id"`
 	PsID          api.Integer  `json:"ps_id"`
-	PsKey         string `json:"ps_key"`
+	PsKey         api.PsKey    `json:"ps_key"`
 	UUID          api.Integer  `json:"uuid"`
 }
 
diff --git a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
index 07d859b3c..f3cbc858d 100644
--- a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
+++ b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
@@ -32,13 +32,13 @@ func (rd RequestData) Help() string {
 type ResultData struct {
 	ConnectType       string `json:"connect_type"`
 	HasAmmeter        api.Integer  `json:"has_ammeter"`
-	IsHaveEsInverter  api.Integer  `json:"is_have_es_inverter"`
-	IsTransformSystem string `json:"is_transform_system"`
+	IsHaveEsInverter  api.Bool  `json:"is_have_es_inverter"`
+	IsTransformSystem api.Bool `json:"is_transform_system"`
 
-	DayData   *DayData   `json:"day_data"`
-	MonthData *MonthData `json:"month_data"`
-	YearData  *YearData  `json:"year_data"`
-	TotalData *TotalData `json:"total_data"`
+	DayData   *DayData   `json:"day_data,omitempty"`
+	MonthData *MonthData `json:"month_data,omitempty"`
+	YearData  *YearData  `json:"year_data,omitempty"`
+	TotalData *TotalData `json:"total_data,omitempty"`
 }
 
 type DayData struct {
@@ -64,28 +64,28 @@ type DayData struct {
 	P83119MapVirgin api.UnitValue `json:"p83119_map_virgin"  PointIgnore:"true"`
 	P83120Map       api.UnitValue `json:"p83120_map"  PointId:"p83120" PointType:"PointTypeDaily"`
 	P83120MapVirgin api.UnitValue `json:"p83120_map_virgin"  PointIgnore:"true"`
-	P83121          string        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeDaily"`
-	P83122          string        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeDaily"`
+	P83121          api.Float        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeDaily"`
+	P83122          api.Float        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeDaily"`
 	PointData15List []struct {
-		P83076     string `json:"p83076"  PointId:"p83076" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83076Unit string `json:"p83076_unit"`
-		P83080     string `json:"p83080"  PointId:"p83080" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83080Unit string `json:"p83080_unit"`
-		P83086     string `json:"p83086"  PointId:"p83086" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83086Unit string `json:"p83086_unit"`
-		P83087     string `json:"p83087"  PointId:"p83087" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83087Unit string `json:"p83087_unit"`
-		P83096     string `json:"p83096"  PointId:"p83096" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83096Unit string `json:"p83096_unit"`
-		P83101     string `json:"p83101"  PointId:"p83101" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83101Unit string `json:"p83101_unit"`
-		P83106     string `json:"p83106"  PointId:"p83106" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83106Unit string `json:"p83106_unit"`
-		P83128     string `json:"p83128"  PointId:"p83128" PointUnit:"W" PointType:"PointTypeDaily"`
-		P83128Unit string `json:"p83128_unit"`
-		TimeStamp  string `json:"time_stamp"`
-		Zfzy       string `json:"zfzy"`
-		ZfzyUnit   string `json:"zfzy_unit"`
+		P83076     api.Float  `json:"p83076"  PointId:"p83076" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83076Unit api.String   `json:"p83076_unit"`
+		P83080     api.Float  `json:"p83080"  PointId:"p83080" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83080Unit api.String   `json:"p83080_unit"`
+		P83086     api.Float  `json:"p83086"  PointId:"p83086" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83086Unit api.String   `json:"p83086_unit"`
+		P83087     api.Float  `json:"p83087"  PointId:"p83087" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83087Unit api.String   `json:"p83087_unit"`
+		P83096     api.Float  `json:"p83096"  PointId:"p83096" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83096Unit api.String   `json:"p83096_unit"`
+		P83101     api.Float  `json:"p83101"  PointId:"p83101" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83101Unit api.String   `json:"p83101_unit"`
+		P83106     api.Float  `json:"p83106"  PointId:"p83106" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83106Unit api.String   `json:"p83106_unit"`
+		P83128     api.Float  `json:"p83128"  PointId:"p83128" PointUnit:"W" PointType:"PointTypeDaily"`
+		P83128Unit api.String   `json:"p83128_unit"`
+		TimeStamp  api.DateTime `json:"time_stamp"`
+		Zfzy       api.Float   `json:"zfzy"`
+		ZfzyUnit   api.String   `json:"zfzy_unit"`
 	} `json:"point_data_15_list"`
 	ZfzyMap       api.UnitValue `json:"zfzy_map"`
 	ZfzyMapVirgin api.UnitValue `json:"zfzy_map_virgin"  PointIgnore:"true"`
@@ -100,34 +100,34 @@ type MonthData struct {
 	JtydMapVirgin    api.UnitValue `json:"jtyd_map_virgin"  PointIgnore:"true"`
 	MonthDataDayList []struct {
 		DateID                   api.Integer `json:"date_id"`
-		Jthd                     string      `json:"jthd"`
-		JthdUnit                 string      `json:"jthd_unit"`
-		Jtyd                     string      `json:"jtyd"`
-		JtydUnit                 string      `json:"jtyd_unit"`
-		P83022                   string      `json:"p83022"  PointId:"p83022" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83072                   string      `json:"p83072"  PointId:"p83072" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83072Unit               string      `json:"p83072_unit"`
-		P83077                   string      `json:"p83077"  PointId:"p83077" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83077Unit               string      `json:"p83077_unit"`
-		P83088                   string      `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83088Unit               string      `json:"p83088_unit"`
-		P83089                   string      `json:"p83089"  PointId:"p83089" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83089Unit               string      `json:"p83089_unit"`
-		P83097                   string      `json:"p83097"  PointId:"p83097" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83097Unit               string      `json:"p83097_unit"`
-		P83102                   string      `json:"p83102"  PointId:"p83102" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83102Unit               string      `json:"p83102_unit"`
-		P83118                   string      `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83118Unit               string      `json:"p83118_unit"`
-		P83119                   string      `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83119Unit               string      `json:"p83119_unit"`
-		P83120                   string      `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83121                   string      `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeMonthly"`
-		P83122                   string      `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeMonthly"`
-		PsID                     interface{} `json:"ps_id"`
-		SelfConsumptionYield     string      `json:"self_consumption_yield"`
-		SelfConsumptionYieldUnit string      `json:"self_consumption_yield_unit"`
-		TimeStamp                string      `json:"time_stamp"`
+		Jthd                     api.Float      `json:"jthd"`
+		JthdUnit                 api.String      `json:"jthd_unit"`
+		Jtyd                     api.Float      `json:"jtyd"`
+		JtydUnit                 api.String      `json:"jtyd_unit"`
+		P83022                   api.Float      `json:"p83022"  PointId:"p83022" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83072                   api.Float      `json:"p83072"  PointId:"p83072" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83072Unit               api.String      `json:"p83072_unit"`
+		P83077                   api.Float      `json:"p83077"  PointId:"p83077" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83077Unit               api.String      `json:"p83077_unit"`
+		P83088                   api.Float      `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83088Unit               api.String      `json:"p83088_unit"`
+		P83089                   api.Float      `json:"p83089"  PointId:"p83089" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83089Unit               api.String      `json:"p83089_unit"`
+		P83097                   api.Float      `json:"p83097"  PointId:"p83097" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83097Unit               api.String      `json:"p83097_unit"`
+		P83102                   api.Float      `json:"p83102"  PointId:"p83102" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83102Unit               api.String      `json:"p83102_unit"`
+		P83118                   api.Float      `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83118Unit               api.String      `json:"p83118_unit"`
+		P83119                   api.Float      `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83119Unit               api.String      `json:"p83119_unit"`
+		P83120                   api.Float      `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83121                   api.Float      `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeMonthly"`
+		P83122                   api.Float      `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeMonthly"`
+		PsID                     api.Integer    `json:"ps_id"`
+		SelfConsumptionYield     api.Float      `json:"self_consumption_yield"`
+		SelfConsumptionYieldUnit api.String      `json:"self_consumption_yield_unit"`
+		TimeStamp                api.DateTime      `json:"time_stamp"`
 	} `json:"month_data_day_list"`
 	P83073Map       api.UnitValue `json:"p83073_map"  PointId:"p83073" PointType:"PointTypeMonthly"`
 	P83073MapVirgin api.UnitValue `json:"p83073_map_virgin"  PointIgnore:"true"`
@@ -147,8 +147,8 @@ type MonthData struct {
 	P83119MapVirgin api.UnitValue `json:"p83119_map_virgin"  PointIgnore:"true"`
 	P83120Map       api.UnitValue `json:"p83120_map"  PointId:"p83120" PointType:"PointTypeMonthly"`
 	P83120MapVirgin api.UnitValue `json:"p83120_map_virgin"  PointIgnore:"true"`
-	P83121          string        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeMonthly"`
-	P83122          string        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeMonthly"`
+	P83121          api.Float        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeMonthly"`
+	P83122          api.Float        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeMonthly"`
 	ZfzyMap         api.UnitValue `json:"zfzy_map"`
 	ZfzyMapVirgin   api.UnitValue `json:"zfzy_map_virgin"  PointIgnore:"true"`
 	ZjzzMap         api.UnitValue `json:"zjzz_map"`
@@ -178,38 +178,38 @@ type YearData struct {
 	P83119MapVirgin   api.UnitValue `json:"p83119_map_virgin"  PointIgnore:"true"`
 	P83120         api.UnitValue `json:"p83120_map"  PointId:"p83120" PointType:"PointTypeYearly"`
 	P83120MapVirgin   api.UnitValue `json:"p83120_map_virgin"  PointIgnore:"true"`
-	P83121            string        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeYearly"`
-	P83122            string        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeYearly"`
+	P83121            api.Float        `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeYearly"`
+	P83122            api.Float        `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeYearly"`
 	YearDataMonthList []struct {
 		DateID                   api.Integer  `json:"date_id"`
-		Jthd                     string `json:"jthd"`
-		JthdUnit                 string `json:"jthd_unit"`
-		Jtyd                     string `json:"jtyd"`
-		JtydUnit                 string `json:"jtyd_unit"`
-		P83037                   string `json:"p83037"  PointId:"p83037" PointUnit:"" PointType:"PointTypeYearly"`
-		P83073                   string `json:"p83073"  PointId:"p83073" PointUnit:"" PointType:"PointTypeYearly"`
-		P83073Unit               string `json:"p83073_unit"`
-		P83078                   string `json:"p83078"  PointId:"p83078" PointUnit:"" PointType:"PointTypeYearly"`
-		P83078Unit               string `json:"p83078_unit"`
-		P83088                   string `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeYearly"`
-		P83088Unit               string `json:"p83088_unit"`
-		P83091                   string `json:"p83091"  PointId:"p83091" PointUnit:"" PointType:"PointTypeYearly"`
-		P83091Unit               string `json:"p83091_unit"`
-		P83098                   string `json:"p83098"  PointId:"p83098" PointUnit:"" PointType:"PointTypeYearly"`
-		P83098Unit               string `json:"p83098_unit"`
-		P83103                   string `json:"p83103"  PointId:"p83103" PointUnit:"" PointType:"PointTypeYearly"`
-		P83103Unit               string `json:"p83103_unit"`
-		P83118                   string `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeYearly"`
-		P83118Unit               string `json:"p83118_unit"`
-		P83119                   string `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeYearly"`
-		P83119Unit               string `json:"p83119_unit"`
-		P83120                   string `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeYearly"`
-		P83121                   string `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeYearly"`
-		P83122                   string `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeYearly"`
+		Jthd                     api.Float `json:"jthd"`
+		JthdUnit                 api.String `json:"jthd_unit"`
+		Jtyd                     api.Float `json:"jtyd"`
+		JtydUnit                 api.String `json:"jtyd_unit"`
+		P83037                   api.Float `json:"p83037"  PointId:"p83037" PointUnit:"" PointType:"PointTypeYearly"`
+		P83073                   api.Float `json:"p83073"  PointId:"p83073" PointUnit:"" PointType:"PointTypeYearly"`
+		P83073Unit               api.String `json:"p83073_unit"`
+		P83078                   api.Float `json:"p83078"  PointId:"p83078" PointUnit:"" PointType:"PointTypeYearly"`
+		P83078Unit               api.String `json:"p83078_unit"`
+		P83088                   api.Float `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeYearly"`
+		P83088Unit               api.String `json:"p83088_unit"`
+		P83091                   api.Float `json:"p83091"  PointId:"p83091" PointUnit:"" PointType:"PointTypeYearly"`
+		P83091Unit               api.String `json:"p83091_unit"`
+		P83098                   api.Float `json:"p83098"  PointId:"p83098" PointUnit:"" PointType:"PointTypeYearly"`
+		P83098Unit               api.String `json:"p83098_unit"`
+		P83103                   api.Float `json:"p83103"  PointId:"p83103" PointUnit:"" PointType:"PointTypeYearly"`
+		P83103Unit               api.String `json:"p83103_unit"`
+		P83118                   api.Float `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeYearly"`
+		P83118Unit               api.String `json:"p83118_unit"`
+		P83119                   api.Float `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeYearly"`
+		P83119Unit               api.String `json:"p83119_unit"`
+		P83120                   api.Float `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeYearly"`
+		P83121                   api.Float `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeYearly"`
+		P83122                   api.Float `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeYearly"`
 		PsID                     api.Integer  `json:"ps_id"`
-		SelfConsumptionYield     string `json:"self_consumption_yield"`
-		SelfConsumptionYieldUnit string `json:"self_consumption_yield_unit"`
-		TimeStamp                string `json:"time_stamp"`
+		SelfConsumptionYield     api.Float `json:"self_consumption_yield"`
+		SelfConsumptionYieldUnit api.String `json:"self_consumption_yield_unit"`
+		TimeStamp                api.DateTime `json:"time_stamp"`
 	} `json:"year_data_month_list"`
 	ZfzyMap       api.UnitValue `json:"zfzy_map"`
 	ZfzyMapVirgin api.UnitValue `json:"zfzy_map_virgin"  PointIgnore:"true"`
@@ -236,40 +236,40 @@ type TotalData struct {
 	P83123MapVirgin   api.UnitValue `json:"p83123_map_virgin"  PointIgnore:"true"`
 	P83124            api.UnitValue `json:"p83124_map"  PointId:"p83124" PointType:"PointTypeTotal"`
 	P83124MapVirgin   api.UnitValue `json:"p83124_map_virgin"  PointIgnore:"true"`
-	P83125            string        `json:"p83125"  PointId:"p83125" PointUnit:"" PointType:"PointTypeTotal"`
-	P83126            string        `json:"p83126"  PointId:"p83126" PointUnit:"" PointType:"PointTypeTotal"`
+	P83125            api.Float        `json:"p83125"  PointId:"p83125" PointUnit:"" PointType:"PointTypeTotal"`
+	P83126            api.Float        `json:"p83126"  PointId:"p83126" PointUnit:"" PointType:"PointTypeTotal"`
 	P83127            api.UnitValue `json:"p83127_map"  PointId:"p83127" PointType:"PointTypeTotal"`
 	P83127MapVirgin   api.UnitValue `json:"p83127_map_virgin"  PointIgnore:"true"`
 	TotalDataYearList []struct {
 		DateID                   api.Integer  `json:"date_id"`
-		Jthd                     string `json:"jthd"`
-		JthdUnit                 string `json:"jthd_unit"`
-		Jtyd                     string `json:"jtyd"`
-		JtydUnit                 string `json:"jtyd_unit"`
-		P83038                   api.Integer  `json:"p83038"  PointId:"p83038" PointUnit:"" PointType:"PointTypeTotal"`
-		P83074                   string `json:"p83074"  PointId:"p83074" PointUnit:"" PointType:"PointTypeTotal"`
-		P83074Unit               string `json:"p83074_unit"`
-		P83079                   string `json:"p83079"  PointId:"p83079" PointUnit:"" PointType:"PointTypeTotal"`
-		P83079Unit               string `json:"p83079_unit"`
-		P83088                   string `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeTotal"`
-		P83088Unit               string `json:"p83088_unit"`
-		P83093                   string `json:"p83093"  PointId:"p83093" PointUnit:"" PointType:"PointTypeTotal"`
-		P83093Unit               string `json:"p83093_unit"`
-		P83099                   string `json:"p83099"  PointId:"p83099" PointUnit:"" PointType:"PointTypeTotal"`
-		P83099Unit               string `json:"p83099_unit"`
-		P83104                   string `json:"p83104"  PointId:"p83104" PointUnit:"" PointType:"PointTypeTotal"`
-		P83104Unit               string `json:"p83104_unit"`
-		P83118                   string `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeTotal"`
-		P83118Unit               string `json:"p83118_unit"`
-		P83119                   string `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeTotal"`
-		P83119Unit               string `json:"p83119_unit"`
-		P83120                   api.Integer  `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeTotal"`
-		P83121                   string `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeTotal"`
-		P83122                   string `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeTotal"`
+		Jthd                     api.Float `json:"jthd"`
+		JthdUnit                 api.String `json:"jthd_unit"`
+		Jtyd                     api.Float `json:"jtyd"`
+		JtydUnit                 api.String `json:"jtyd_unit"`
+		P83038                   api.Float  `json:"p83038"  PointId:"p83038" PointUnit:"" PointType:"PointTypeTotal"`
+		P83074                   api.Float `json:"p83074"  PointId:"p83074" PointUnit:"" PointType:"PointTypeTotal"`
+		P83074Unit               api.String `json:"p83074_unit"`
+		P83079                   api.Float `json:"p83079"  PointId:"p83079" PointUnit:"" PointType:"PointTypeTotal"`
+		P83079Unit               api.String `json:"p83079_unit"`
+		P83088                   api.Float `json:"p83088"  PointId:"p83088" PointUnit:"" PointType:"PointTypeTotal"`
+		P83088Unit               api.String `json:"p83088_unit"`
+		P83093                   api.Float `json:"p83093"  PointId:"p83093" PointUnit:"" PointType:"PointTypeTotal"`
+		P83093Unit               api.String `json:"p83093_unit"`
+		P83099                   api.Float `json:"p83099"  PointId:"p83099" PointUnit:"" PointType:"PointTypeTotal"`
+		P83099Unit               api.String `json:"p83099_unit"`
+		P83104                   api.Float `json:"p83104"  PointId:"p83104" PointUnit:"" PointType:"PointTypeTotal"`
+		P83104Unit               api.String `json:"p83104_unit"`
+		P83118                   api.Float `json:"p83118"  PointId:"p83118" PointUnit:"" PointType:"PointTypeTotal"`
+		P83118Unit               api.String `json:"p83118_unit"`
+		P83119                   api.Float `json:"p83119"  PointId:"p83119" PointUnit:"" PointType:"PointTypeTotal"`
+		P83119Unit               api.String `json:"p83119_unit"`
+		P83120                   api.Float  `json:"p83120"  PointId:"p83120" PointUnit:"" PointType:"PointTypeTotal"`
+		P83121                   api.Float `json:"p83121"  PointId:"p83121" PointUnit:"" PointType:"PointTypeTotal"`
+		P83122                   api.Float `json:"p83122"  PointId:"p83122" PointUnit:"" PointType:"PointTypeTotal"`
 		PsID                     api.Integer  `json:"ps_id"`
-		SelfConsumptionYield     string `json:"self_consumption_yield"`
-		SelfConsumptionYieldUnit string `json:"self_consumption_yield_unit"`
-		TimeStamp                string `json:"time_stamp"`
+		SelfConsumptionYield     api.Float `json:"self_consumption_yield"`
+		SelfConsumptionYieldUnit api.String `json:"self_consumption_yield_unit"`
+		TimeStamp                api.DateTime `json:"time_stamp"`
 	} `json:"total_data_year_list"`
 	ZfzyMap       api.UnitValue `json:"zfzy_map"`
 	ZfzyMapVirgin api.UnitValue `json:"zfzy_map_virgin"  PointIgnore:"true"`
@@ -366,38 +366,28 @@ func (e *EndPoint) GetData() api.DataMap {
 			name := "getHouseholdStoragePsReport.Day." + e.Request.PsID.String()
 			entries.StructToPoints(*e.Response.ResultData.DayData, name, e.Request.PsID.String(), time.Time{})
 
-			// 83072
-			// 83077
-			// 83088
-			// 83089
-			// 83097
-			// 83102
-			// 83118
-			// 83119
-			// 83120
-
 			for _, d := range e.Response.ResultData.DayData.PointData15List {
 				// pid := api.SetPoint(strconv.FormatInt(p.PointID, 10))
 				// name2 := fmt.Sprintf("getHouseholdStoragePsReport.Fart.%d", i)
 				// si := fmt.Sprintf("%.2d", i)
 				// parent := api.ParentDevice{Key: e.Request.PsID}
 
-				uv := api.SetUnitValueString(d.P83076, d.P83076Unit)
-				entries.AddUnitValue(name + ".p83076", e.Request.PsID.String(), "p83076", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83080, d.P83080Unit)
-				entries.AddUnitValue(name + ".p83080", e.Request.PsID.String(), "p83080", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83086, d.P83086Unit)
-				entries.AddUnitValue(name + ".p83086", e.Request.PsID.String(), "p83086", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83087, d.P83087Unit)
-				entries.AddUnitValue(name + ".p83087", e.Request.PsID.String(), "p83087", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83096, d.P83096Unit)
-				entries.AddUnitValue(name + ".p83096", e.Request.PsID.String(), "p83096", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83101, d.P83101Unit)
-				entries.AddUnitValue(name + ".p83101", e.Request.PsID.String(), "p83101", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83106, d.P83106Unit)
-				entries.AddUnitValue(name + ".p83106", e.Request.PsID.String(), "p83106", "", api.NewDateTime(d.TimeStamp), uv)
-				uv = api.SetUnitValueString(d.P83128, d.P83128Unit)
-				entries.AddUnitValue(name + ".p83128", e.Request.PsID.String(), "p83128", "", api.NewDateTime(d.TimeStamp), uv)
+				uv := api.SetUnitValueFloat(d.P83076.Value(), d.P83076Unit.Value())
+				entries.AddUnitValue(name + ".p83076", e.Request.PsID.String(), "p83076", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83080.Value(), d.P83080Unit.Value())
+				entries.AddUnitValue(name + ".p83080", e.Request.PsID.String(), "p83080", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83086.Value(), d.P83086Unit.Value())
+				entries.AddUnitValue(name + ".p83086", e.Request.PsID.String(), "p83086", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83087.Value(), d.P83087Unit.Value())
+				entries.AddUnitValue(name + ".p83087", e.Request.PsID.String(), "p83087", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83096.Value(), d.P83096Unit.Value())
+				entries.AddUnitValue(name + ".p83096", e.Request.PsID.String(), "p83096", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83101.Value(), d.P83101Unit.Value())
+				entries.AddUnitValue(name + ".p83101", e.Request.PsID.String(), "p83101", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83106.Value(), d.P83106Unit.Value())
+				entries.AddUnitValue(name + ".p83106", e.Request.PsID.String(), "p83106", "", d.TimeStamp, uv)
+				uv = api.SetUnitValueFloat(d.P83128.Value(), d.P83128Unit.Value())
+				entries.AddUnitValue(name + ".p83128", e.Request.PsID.String(), "p83128", "", d.TimeStamp, uv)
 			}
 		}
 	}
diff --git a/iSolarCloud/AppService/getIncomeSettingInfos/data.go b/iSolarCloud/AppService/getIncomeSettingInfos/data.go
index f9378f669..369b48579 100644
--- a/iSolarCloud/AppService/getIncomeSettingInfos/data.go
+++ b/iSolarCloud/AppService/getIncomeSettingInfos/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getIncomeSettingInfos"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getModuleLogTaskList/data.go b/iSolarCloud/AppService/getModuleLogTaskList/data.go
index a13f895dd..f72637668 100644
--- a/iSolarCloud/AppService/getModuleLogTaskList/data.go
+++ b/iSolarCloud/AppService/getModuleLogTaskList/data.go
@@ -23,36 +23,36 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	CurPage  api.Integer `json:"curPage"`
-	IsMore   interface{} `json:"isMore"`
+	IsMore   api.Bool    `json:"isMore"`
 	PageList []struct {
-		BatchID        string      `json:"batch_id"`
+		BatchID        api.String      `json:"batch_id"`
 		CommandStatus  api.Integer `json:"command_status"`
 		CommandType    api.Integer `json:"command_type"`
-		CreateTime     string      `json:"create_time"`
-		DeviceCode     string      `json:"device_code"`
-		DeviceModel    interface{} `json:"device_model"`
-		DeviceModelID  interface{} `json:"device_model_id"`
+		CreateTime     api.DateTime      `json:"create_time"`
+		DeviceCode     api.Integer      `json:"device_code"`
+		DeviceModel    api.String `json:"device_model"`
+		DeviceModelID  api.String `json:"device_model_id"`
 		ExpireSecond   api.Integer `json:"expire_second"`
-		LogType        string      `json:"log_type"`
-		LoggerCode     string      `json:"logger_code"`
+		LogType        api.Integer      `json:"log_type"`
+		LoggerCode     api.Integer      `json:"logger_code"`
 		OperateUserID  api.Integer `json:"operate_user_id"`
-		OverTime       string      `json:"over_time"`
-		Remark         string      `json:"remark"`
+		OverTime       api.DateTime      `json:"over_time"`
+		Remark         api.String      `json:"remark"`
 		SetCancelNum   api.Integer `json:"set_cancel_num"`
 		SetFailNum     api.Integer `json:"set_fail_num"`
 		SetFinishNum   api.Integer `json:"set_finish_num"`
 		SetOvertimeNum api.Integer `json:"set_overtime_num"`
 		SetSuccessNum  api.Integer `json:"set_success_num"`
 		SetTotalNum    api.Integer `json:"set_total_num"`
-		Sn             string      `json:"sn"`
+		Sn             api.String      `json:"sn"`
 		TaskID         api.Integer `json:"task_id"`
-		TaskName       string      `json:"task_name"`
-		UpdateTime     string      `json:"update_time"`
+		TaskName       api.Integer      `json:"task_name"`
+		UpdateTime     api.DateTime      `json:"update_time"`
 	} `json:"pageList"`
 	RowCount   api.Integer `json:"rowCount"`
 	Size       api.Integer `json:"size"`
-	StartIndex interface{} `json:"startIndex"`
-	TotalPage  interface{} `json:"totalPage"`
+	StartIndex api.Integer `json:"startIndex"`
+	TotalPage  api.Integer `json:"totalPage"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getOSSConfig/data.go b/iSolarCloud/AppService/getOSSConfig/data.go
index 9ca1baac3..0c0fb2165 100644
--- a/iSolarCloud/AppService/getOSSConfig/data.go
+++ b/iSolarCloud/AppService/getOSSConfig/data.go
@@ -1,6 +1,7 @@
 package getOSSConfig
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
 	"fmt"
 )
@@ -23,15 +24,15 @@ func (rd RequestData) Help() string {
 
 
 type ResultData struct {
-	AccessId       string `json:"accessid"`
-	Dir            string `json:"dir"`
-	Expire         string `json:"expire"`
-	Host           string `json:"host"`
-	IsPrivateCloud string `json:"is_private_cloud"`
-	OssFileURL     string `json:"oss_file_url"`
-	Policy         string `json:"policy"`
-	SguZipDir      string `json:"sgu_zip_dir"`
-	Signature      string `json:"signature"`
+	AccessId       api.String   `json:"accessid"`
+	Dir            api.String   `json:"dir"`
+	Expire         api.Integer   `json:"expire"`
+	Host           api.String   `json:"host"`
+	IsPrivateCloud api.Bool `json:"is_private_cloud"`
+	OssFileURL     api.String   `json:"oss_file_url"`
+	Policy         api.String   `json:"policy"`
+	SguZipDir      api.String   `json:"sgu_zip_dir"`
+	Signature      api.String   `json:"signature"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getOrgListByName/data.go b/iSolarCloud/AppService/getOrgListByName/data.go
index 3eda34c68..5c6664d0b 100644
--- a/iSolarCloud/AppService/getOrgListByName/data.go
+++ b/iSolarCloud/AppService/getOrgListByName/data.go
@@ -23,9 +23,9 @@ func (rd RequestData) Help() string {
 }
 
 type ResultData []struct {
-	IsLeaf  api.Integer  `json:"is_leaf"`
-	OrgID   api.Integer  `json:"org_id"`
-	OrgName string `json:"org_name"`
+	IsLeaf  api.Bool    `json:"is_leaf"`
+	OrgID   api.Integer `json:"org_id"`
+	OrgName api.String  `json:"org_name"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getOrgListForUser/data.go b/iSolarCloud/AppService/getOrgListForUser/data.go
index 93ecce2ca..a6a4ddcf8 100644
--- a/iSolarCloud/AppService/getOrgListForUser/data.go
+++ b/iSolarCloud/AppService/getOrgListForUser/data.go
@@ -22,18 +22,17 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
 type ResultData []struct {
 	GcjLatitude    api.Float   `json:"gcj_latitude"`
 	GcjLongitude   api.Float   `json:"gcj_longitude"`
 	ID             api.Integer `json:"id"`
-	IsLeaf         api.Integer `json:"is_leaf"`
+	IsLeaf         api.Bool    `json:"is_leaf"`
 	MapLevel       interface{} `json:"map_level"`
 	OrgID          api.Integer `json:"org_id"`
-	OrgIndexCode   string      `json:"org_index_code"`
+	OrgIndexCode   api.String  `json:"org_index_code"`
 	OrgIsShow      api.Integer `json:"org_is_show"`
 	OrgLevel       api.Integer `json:"org_level"`
-	OrgName        string      `json:"org_name"`
+	OrgName        api.String  `json:"org_name"`
 	SizeChild      api.Integer `json:"size_child"`
 	UpOrgID        api.Integer `json:"up_org_id"`
 	Wgs84Latitude  api.Float   `json:"wgs84_latitude"`
diff --git a/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go b/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go
index a3de1f973..806407823 100644
--- a/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go
+++ b/iSolarCloud/AppService/getPowerChargeSettingInfo/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getPowerChargeSettingInfo"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
index 5969c33f3..df233ed9a 100644
--- a/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
+++ b/iSolarCloud/AppService/getPowerStationBasicInfo/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getPowerStationBasicInfo"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPowerStationForHousehold/data.go b/iSolarCloud/AppService/getPowerStationForHousehold/data.go
index b2d03730c..237e89652 100644
--- a/iSolarCloud/AppService/getPowerStationForHousehold/data.go
+++ b/iSolarCloud/AppService/getPowerStationForHousehold/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getPowerStationForHousehold"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -22,136 +22,135 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
-type ResultData   struct {
-	LbsAreaCode           interface{}   `json:"LbsAreaCode"`
-	LbsCountry            interface{}   `json:"LbsCountry"`
-	AccessType            interface{}   `json:"access_type"`
-	AreaID                interface{}   `json:"area_id"`
-	ArrearsStatus         api.Integer   `json:"arrears_status"`
-	BatteryType           string        `json:"battery_type"`
-	CityCode              interface{}   `json:"city_code"`
-	CityName              interface{}   `json:"city_name"`
-	ComponentArea         interface{}   `json:"component_area"`
-	ComponentStatus       api.Integer   `json:"component_status"`
-	ConnectType           api.Integer   `json:"connect_type"`
-	ConnectTypeDesc       string        `json:"connect_type_desc"`
-	ContactName           string        `json:"contact_name"`
-	CountryID             api.Integer   `json:"country_id"`
-	Description           interface{}   `json:"description"`
-	DesignCapacity        api.Float     `json:"design_capacity"`
-	DesignCapacityBattery string        `json:"design_capacity_battery"`
-	DistrictCode          interface{}   `json:"district_code"`
-	DistrictName          interface{}   `json:"district_name"`
-	DivisionCode          interface{}   `json:"division_code"`
-	Email                 string        `json:"email"`
-	EnergyScheme          interface{}   `json:"energy_scheme"`
-	ExpectInstallDate     api.DateTime        `json:"expect_install_date"`
-	GcjLatitude           api.Float     `json:"gcj_latitude"`
-	GcjLongitude          api.Float     `json:"gcj_longitude"`
-	GprsLatitude          api.Float     `json:"gprs_latitude"`
-	GprsLongitude         api.Float     `json:"gprs_longitude"`
-	GridLevel             interface{}   `json:"grid_level"`
-	Images                []interface{} `json:"images"`
-	InstallDate           api.DateTime        `json:"install_date"`
-	InstallDateZone       string        `json:"install_date_zone"`
-	InverterCount         api.Integer   `json:"inverter_count"`
-	InvestmentType        api.Integer   `json:"investment_type"`
-	InvestmentTypeDesc    string        `json:"investment_type_desc"`
-	IsAgreeGdpr           api.Integer   `json:"is_agree_gdpr"`
-	IsGdpr                api.Integer   `json:"is_gdpr"`
-	IsNewVersion          api.Integer   `json:"is_new_version"`
-	IsOpenProtocol        api.Integer   `json:"is_open_protocol"`
-	IsPsCreateUser        string        `json:"is_ps_create_user"`
-	IsPsOwner             string        `json:"is_ps_owner"`
-	IsReceiveNotice       api.Integer   `json:"is_receive_notice"`
-	IsSharePosition       api.Integer   `json:"is_share_position"`
-	IsValidMobileEmail    api.Integer   `json:"is_valid_mobile_email"`
-	Latitude              api.Float     `json:"latitude"`
-	Longitude             api.Float     `json:"longitude"`
-	MapLatitude           api.Float     `json:"map_latitude"`
-	MapLongitude          api.Float     `json:"map_longitude"`
-	MlpeFlag              api.Integer   `json:"mlpe_flag"`
-	MobleTel              interface{}   `json:"moble_tel"`
-	MobleTelBak           interface{}   `json:"moble_tel_bak"`
-	ModuleModelID         interface{}   `json:"module_model_id"`
-	ModuleModelName       interface{}   `json:"module_model_name"`
-	Nmi                   string        `json:"nmi"`
-	OperationBusName      interface{}   `json:"operation_bus_name"`
-	OrgIndexCode          []string      `json:"org_index_code"`
-	OwnerContact          interface{}   `json:"owner_contact"`
-	ParamIncomeUnit       api.Integer   `json:"param_income_unit"`
-	ParamIncomeUnitName   string        `json:"param_income_unit_name"`
-	ProvinceCode          interface{}   `json:"province_code"`
-	ProvinceName          interface{}   `json:"province_name"`
-	PsBuildDate           api.DateTime        `json:"ps_build_date"`
-	PsCountryID           api.Integer   `json:"ps_country_id"`
-	PsCreateUserID        api.Integer   `json:"ps_create_user_id"`
-	PsCurrentTimeZone     string        `json:"ps_current_time_zone"`
+type ResultData struct {
+	LbsAreaCode           api.String   `json:"LbsAreaCode"`
+	LbsCountry            api.String   `json:"LbsCountry"`
+	AccessType            interface{}  `json:"access_type"`
+	AreaID                interface{}  `json:"area_id"`
+	ArrearsStatus         api.Integer  `json:"arrears_status"`
+	BatteryType           string       `json:"battery_type"`
+	CityCode              api.String   `json:"city_code"`
+	CityName              api.String   `json:"city_name"`
+	ComponentArea         interface{}  `json:"component_area"`
+	ComponentStatus       api.Integer  `json:"component_status"`
+	ConnectType           api.Integer  `json:"connect_type"`
+	ConnectTypeDesc       api.String   `json:"connect_type_desc"`
+	ContactName           api.String   `json:"contact_name"`
+	CountryID             api.Integer  `json:"country_id"`
+	Description           api.String   `json:"description"`
+	DesignCapacity        api.Float    `json:"design_capacity"`
+	DesignCapacityBattery api.Float    `json:"design_capacity_battery"`
+	DistrictCode          api.String   `json:"district_code"`
+	DistrictName          api.String   `json:"district_name"`
+	DivisionCode          api.String   `json:"division_code"`
+	Email                 api.String   `json:"email"`
+	EnergyScheme          interface{}  `json:"energy_scheme"`
+	ExpectInstallDate     api.DateTime `json:"expect_install_date"`
+	GcjLatitude           api.Float    `json:"gcj_latitude"`
+	GcjLongitude          api.Float    `json:"gcj_longitude"`
+	GprsLatitude          api.Float    `json:"gprs_latitude"`
+	GprsLongitude         api.Float    `json:"gprs_longitude"`
+	GridLevel             interface{}  `json:"grid_level"`
+	Images                []api.String `json:"images"`
+	InstallDate           api.DateTime `json:"install_date"`
+	InstallDateZone       api.DateTime `json:"install_date_zone"`
+	InverterCount         api.Integer  `json:"inverter_count"`
+	InvestmentType        api.Integer  `json:"investment_type"`
+	InvestmentTypeDesc    api.String   `json:"investment_type_desc"`
+	IsAgreeGdpr           api.Bool     `json:"is_agree_gdpr"`
+	IsGdpr                api.Bool     `json:"is_gdpr"`
+	IsNewVersion          api.Bool     `json:"is_new_version"`
+	IsOpenProtocol        api.Bool     `json:"is_open_protocol"`
+	IsPsCreateUser        api.Bool     `json:"is_ps_create_user"`
+	IsPsOwner             api.Bool     `json:"is_ps_owner"`
+	IsReceiveNotice       api.Bool     `json:"is_receive_notice"`
+	IsSharePosition       api.Bool     `json:"is_share_position"`
+	IsValidMobileEmail    api.Bool     `json:"is_valid_mobile_email"`
+	Latitude              api.Float    `json:"latitude"`
+	Longitude             api.Float    `json:"longitude"`
+	MapLatitude           api.Float    `json:"map_latitude"`
+	MapLongitude          api.Float    `json:"map_longitude"`
+	MlpeFlag              api.Integer  `json:"mlpe_flag"`
+	MobileTel             api.String   `json:"moble_tel"`
+	MobileTelBak          api.String   `json:"moble_tel_bak"`
+	ModuleModelID         interface{}  `json:"module_model_id"`
+	ModuleModelName       api.String   `json:"module_model_name"`
+	Nmi                   api.String   `json:"nmi"`
+	OperationBusName      api.String   `json:"operation_bus_name"`
+	OrgIndexCode          []api.String `json:"org_index_code"`
+	OwnerContact          api.String   `json:"owner_contact"`
+	ParamIncomeUnit       api.Integer  `json:"param_income_unit"`
+	ParamIncomeUnitName   api.String   `json:"param_income_unit_name"`
+	ProvinceCode          api.String   `json:"province_code"`
+	ProvinceName          api.String   `json:"province_name"`
+	PsBuildDate           api.DateTime `json:"ps_build_date"`
+	PsCountryID           api.Integer  `json:"ps_country_id"`
+	PsCreateUserID        api.Integer  `json:"ps_create_user_id"`
+	PsCurrentTimeZone     string       `json:"ps_current_time_zone"`
 	PsDirectOrgList       []struct {
-		OrgID        api.Integer  `json:"org_id"`
-		OrgIndexCode string `json:"org_index_code"`
-		OrgName      string `json:"org_name"`
+		OrgID        api.Integer `json:"org_id"`
+		OrgIndexCode api.String  `json:"org_index_code"`
+		OrgName      api.String  `json:"org_name"`
 	} `json:"ps_direct_org_list"`
-	PsHolder         string `json:"ps_holder"`
-	PsID             api.Integer  `json:"ps_id"`
-	PsInstalledPower api.Float `json:"ps_installed_power"`
-	PsKey            string `json:"ps_key"`
-	PsLocation       string `json:"ps_location"`
-	PsName           string `json:"ps_name"`
+	PsHolder         api.String  `json:"ps_holder"`
+	PsID             api.Integer `json:"ps_id"`
+	PsInstalledPower api.Float   `json:"ps_installed_power"`
+	PsKey            api.PsKey   `json:"ps_key"`
+	PsLocation       api.String  `json:"ps_location"`
+	PsName           api.String  `json:"ps_name"`
 	PsOrgInfo        []struct {
-		DealerOrgCode   string `json:"dealer_org_code"`
-		Installer       string `json:"installer"`
-		InstallerEmail  string `json:"installer_email"`
-		InstallerPhone  string `json:"installer_phone"`
-		OrgID           api.Integer  `json:"org_id"`
-		OrgIndexCode    string `json:"org_index_code"`
-		OrgName         string `json:"org_name"`
-		PsDealerOrgCode string `json:"ps_dealer_org_code"`
-		UpOrgID         api.Integer  `json:"up_org_id"`
+		DealerOrgCode   api.String  `json:"dealer_org_code"`
+		Installer       api.String  `json:"installer"`
+		InstallerEmail  api.String  `json:"installer_email"`
+		InstallerPhone  api.String  `json:"installer_phone"`
+		OrgID           api.Integer `json:"org_id"`
+		OrgIndexCode    api.String  `json:"org_index_code"`
+		OrgName         api.String  `json:"org_name"`
+		PsDealerOrgCode api.String  `json:"ps_dealer_org_code"`
+		UpOrgID         api.Integer `json:"up_org_id"`
 	} `json:"ps_org_info"`
-	PsPrice          string `json:"ps_price"`
-	PsPriceKwh       string `json:"ps_price_kwh"`
+	PsPrice          api.Float    `json:"ps_price"`
+	PsPriceKwh       api.Float    `json:"ps_price_kwh"`
 	PsType           api.Integer  `json:"ps_type"`
-	PsTypeDesc       string `json:"ps_type_desc"`
-	PsTypeName       string `json:"ps_type_name"`
+	PsTypeDesc       api.String   `json:"ps_type_desc"`
+	PsTypeName       api.String   `json:"ps_type_name"`
 	PsUserID         api.Integer  `json:"ps_user_id"`
-	RecoreCreateTime string `json:"recore_create_time"`
+	RecordCreateTime api.DateTime `json:"recore_create_time"`
 	SafeStartDate    api.DateTime `json:"safe_start_date"`
 	SelectedOrgList  []struct {
-		OrgID        api.Integer  `json:"org_id"`
-		OrgIndexCode string `json:"org_index_code"`
-		OrgName      string `json:"org_name"`
+		OrgID        api.Integer `json:"org_id"`
+		OrgIndexCode api.String  `json:"org_index_code"`
+		OrgName      api.String  `json:"org_name"`
 	} `json:"selectedOrgList"`
 	SetUserOrg      string      `json:"set_user_org"`
 	ShareType       string      `json:"share_type"`
 	ShareUserType   interface{} `json:"share_user_type"`
-	ShippingAddress string      `json:"shipping_address"`
-	ShippingZipCode string      `json:"shipping_zip_code"`
-	Sn              string      `json:"sn"`
+	ShippingAddress api.String  `json:"shipping_address"`
+	ShippingZipCode api.String  `json:"shipping_zip_code"`
+	Sn              api.String  `json:"sn"`
 	SnDetailList    []struct {
-		CommunicateDeviceType     api.Integer  `json:"communicate_device_type"`
-		CommunicateDeviceTypeName string `json:"communicate_device_type_name"`
-		ID                        api.Integer  `json:"id"`
-		IsEnable                  api.Integer  `json:"is_enable"`
-		Sn                        string `json:"sn"`
+		CommunicateDeviceType     api.Integer `json:"communicate_device_type"`
+		CommunicateDeviceTypeName api.String  `json:"communicate_device_type_name"`
+		ID                        api.Integer `json:"id"`
+		IsEnable                  api.Bool    `json:"is_enable"`
+		Sn                        api.String  `json:"sn"`
 	} `json:"sn_detail_list"`
 	SummerTimeState    api.Integer `json:"summer_time_state"`
-	SummerTimeZone     string      `json:"summer_time_zone"`
+	SummerTimeZone     api.String  `json:"summer_time_zone"`
 	SummerTimeZoneID   api.Integer `json:"summer_time_zone_id"`
 	TimeZoneID         api.Integer `json:"time_zone_id"`
-	Timezone           string      `json:"timezone"`
-	UserAccount        string      `json:"user_account"`
+	Timezone           api.String  `json:"timezone"`
+	UserAccount        api.String  `json:"user_account"`
 	UserCapacityStatus api.Integer `json:"user_capacity_status"`
-	UserEnglishName    interface{} `json:"user_english_name"`
-	UserLanguage       string      `json:"user_language"`
-	UserMobleTel       interface{} `json:"user_moble_tel"`
-	UserName           string      `json:"user_name"`
-	UserTelNationCode  interface{} `json:"user_tel_nation_code"`
+	UserEnglishName    api.String  `json:"user_english_name"`
+	UserLanguage       api.String  `json:"user_language"`
+	UserMobileTel      api.String  `json:"user_moble_tel"`
+	UserName           api.String  `json:"user_name"`
+	UserTelNationCode  api.String  `json:"user_tel_nation_code"`
 	ValidFlag          api.Integer `json:"valid_flag"`
 	WgsLatitude        api.Float   `json:"wgs_latitude"`
 	WgsLongitude       api.Float   `json:"wgs_longitude"`
-	ZipCode            string      `json:"zip_code"`
+	ZipCode            api.String  `json:"zip_code"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPowerStationInfo/data.go b/iSolarCloud/AppService/getPowerStationInfo/data.go
index bb15dcbd5..dab4572a9 100644
--- a/iSolarCloud/AppService/getPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/getPowerStationInfo/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getPowerStationInfo"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPowerStatistics/data.go b/iSolarCloud/AppService/getPowerStatistics/data.go
index e55315bb5..094715abf 100644
--- a/iSolarCloud/AppService/getPowerStatistics/data.go
+++ b/iSolarCloud/AppService/getPowerStatistics/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/getPowerStatistics"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPsDetail/data.go b/iSolarCloud/AppService/getPsDetail/data.go
index fdce069d3..6e91fed83 100644
--- a/iSolarCloud/AppService/getPsDetail/data.go
+++ b/iSolarCloud/AppService/getPsDetail/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	ActualEnergy          []string      `json:"actual_energy"`
-	ActualEnergyUnit      string        `json:"actual_energy_unit"`
+	ActualEnergyUnit      api.String        `json:"actual_energy_unit"`
 	AlarmCount            api.Integer   `json:"alarm_count"`
 	AreaID                interface{}   `json:"area_id"`
 	AreaType              api.Integer   `json:"area_type"`
@@ -37,14 +37,14 @@ type ResultData struct {
 	CoalReduceTotal       api.UnitValue `json:"coal_reduce_total"   PointId:"coal_reduce_total" PointType:"PointTypeTotal"`
 	ConnectGrid           string        `json:"connect_grid"`
 	ConnectType           api.Integer   `json:"connect_type"`
-	ContactPerson         string        `json:"contact_person"`
+	ContactPerson         api.String        `json:"contact_person"`
 	CurrPower             api.UnitValue `json:"curr_power"` // Pv Power
-	DataLastUpdateTime    string        `json:"data_last_update_time"`
+	DataLastUpdateTime    api.DateTime        `json:"data_last_update_time"`
 	DayEqHours            string        `json:"day_eq_hours"`
 	Description           interface{}   `json:"description"`
 	DesignCapacity        api.UnitValue `json:"design_capacity"`
 	DesignCapacityBattery api.UnitValue `json:"design_capacity_battery"`
-	DiagramURL            string        `json:"diagram_url"`
+	DiagramURL            api.String        `json:"diagram_url"`
 	EnergyScheme          interface{}   `json:"energy_scheme"`
 	ExpectInstallDate     api.DateTime  `json:"expect_install_date"`
 	FaultCount            api.Integer   `json:"fault_count"`
@@ -53,55 +53,55 @@ type ResultData struct {
 	GcjLongitude          api.Float     `json:"gcj_longitude"`
 	GprsLatitude          api.Float     `json:"gprs_latitude"`
 	GprsLongitude         api.Float     `json:"gprs_longitude"`
-	HasAmmeter            api.Integer   `json:"has_ammeter"`
+	HasAmmeter            api.Bool   `json:"has_ammeter"`
 	Images                []struct {
 		FileID      api.Integer `json:"file_id"`
 		ID          api.Integer `json:"id"`
 		PicLanguage api.Integer `json:"pic_language"`
 		PicType     api.Integer `json:"pic_type"`
-		PictureName string      `json:"picture_name"`
-		PictureURL  string      `json:"picture_url"`
+		PictureName api.String      `json:"picture_name"`
+		PictureURL  api.String      `json:"picture_url"`
 		PsUnitUUID  interface{} `json:"ps_unit_uuid"`
 	} `json:"images"`
 	InstallDate            api.DateTime  `json:"install_date"`
 	InstallerPsFaultStatus string        `json:"installer_ps_fault_status"`
-	IsHaveEsInverter       api.Integer   `json:"is_have_es_inverter"`
-	IsTransformSystem      string        `json:"is_transform_system"`
-	IsTuv                  api.Integer   `json:"is_tuv"`
+	IsHaveEsInverter       api.Bool      `json:"is_have_es_inverter"`
+	IsTransformSystem      api.Bool      `json:"is_transform_system"`
+	IsTuv                  api.Bool      `json:"is_tuv"`
 	Latitude               api.Float     `json:"latitude"`
 	Longitude              api.Float     `json:"longitude"`
 	MapLatitude            api.Float     `json:"map_latitude"`
 	MapLongitude           api.Float     `json:"map_longitude"`
 	MeterReduce            api.UnitValue `json:"meter_reduce"`
 	MeterReduceTotal       api.UnitValue `json:"meter_reduce_total"   PointId:"meter_reduce_total" PointType:"PointTypeTotal"`
-	MobileTel              string        `json:"mibile_tel"   PointId:"mobile_tel"`
+	MobileTel              api.String        `json:"mibile_tel"   PointId:"mobile_tel"`
 	MonthPr                string        `json:"monthPr"   PointId:"monthPr" PointType:"PointTypeMonth"`
 	MonthEnergy            api.UnitValue `json:"month_energy"   PointId:"month_energy" PointType:"PointTypeMonth"`
 	MonthEnergyVirgin      api.UnitValue `json:"month_energy_virgin"  PointIgnore:"true"`
-	MonthEqHours           string        `json:"month_eq_hours"   PointId:"month_eq_hours" PointType:"PointTypeMonth"`
+	MonthEqHours           api.Float        `json:"month_eq_hours"   PointId:"month_eq_hours" PointType:"PointTypeMonth"`
 	MonthIncome            api.UnitValue `json:"month_income"   PointId:"month_income" PointType:"PointTypeMonth"`
 	NoxReduce              api.UnitValue `json:"nox_reduce"`
 	NoxReduceTotal         api.UnitValue `json:"nox_reduce_total"   PointId:"nox_reduce_total" PointType:"PointTypeTotal"`
 	OperateYear            string        `json:"operate_year"`
-	OperationBusName       string        `json:"operation_bus_name"`
+	OperationBusName       api.String        `json:"operation_bus_name"`
 	OwnerPsFaultStatus     string        `json:"owner_ps_fault_status"`
-	P83012Unit             string        `json:"p83012_unit"   PointId:"P83012Unit" PointType:""  PointIgnore:"true"`
-	P83012Value            string        `json:"p83012_value"   PointId:"P83012Value" PointType:""  PointIgnore:"true"`
-	P83013Unit             string        `json:"p83013_unit"   PointId:"P83013Unit" PointType:""  PointIgnore:"true"`
-	P83013Value            string        `json:"p83013_value"   PointId:"P83013Value" PointType:""  PointIgnore:"true"`
-	P83036Unit             string        `json:"p83036_unit"   PointId:"P83036Unit" PointType:""  PointIgnore:"true"`
-	P83036Value            string        `json:"p83036_value"   PointId:"P83036Value" PointType:""  PointIgnore:"true"`
-	P83016                 string        `json:"p83016"   PointId:"P83016" PointType:""  PointIgnore:"true"`
-	P83016Unit             string        `json:"p83016_unit"   PointId:"P83016Unit" PointType:""  PointIgnore:"true"`
-	P83017                 string        `json:"p83017"   PointId:"P83017" PointType:""  PointIgnore:"true"`
-	P83017Unit             string        `json:"p83017_unit"   PointId:"P83017Unit" PointType:""  PointIgnore:"true"`
-	P83023                 string        `json:"p83023"   PointId:"P83023" PointType:""`
+	P83012Unit             api.String        `json:"p83012_unit"   PointId:"P83012Unit" PointType:""  PointIgnore:"true"`
+	P83012Value            api.Float        `json:"p83012_value"   PointId:"P83012Value" PointType:""  PointIgnore:"true"`
+	P83013Unit             api.String        `json:"p83013_unit"   PointId:"P83013Unit" PointType:""  PointIgnore:"true"`
+	P83013Value            api.Float        `json:"p83013_value"   PointId:"P83013Value" PointType:""  PointIgnore:"true"`
+	P83036Unit             api.String        `json:"p83036_unit"   PointId:"P83036Unit" PointType:""  PointIgnore:"true"`
+	P83036Value            api.Float        `json:"p83036_value"   PointId:"P83036Value" PointType:""  PointIgnore:"true"`
+	P83016                 api.Float        `json:"p83016"   PointId:"P83016" PointType:""  PointIgnore:"true"`
+	P83016Unit             api.String        `json:"p83016_unit"   PointId:"P83016Unit" PointType:""  PointIgnore:"true"`
+	P83017                 api.Float        `json:"p83017"   PointId:"P83017" PointType:""  PointIgnore:"true"`
+	P83017Unit             api.String        `json:"p83017_unit"   PointId:"P83017Unit" PointType:""  PointIgnore:"true"`
+	P83023                 api.Float        `json:"p83023"   PointId:"P83023" PointType:""`
 	P83023y                string        `json:"p83023y"   PointId:"P83023y" PointType:""`
 	P83023year             string        `json:"p83023year"   PointId:"P83023year" PointType:""`
 	P83023ym               string        `json:"p83023ym"   PointId:"P83023ym" PointType:""`
-	P83043                 string        `json:"p83043"   PointId:"P83043" PointType:""`
-	P83044                 string        `json:"p83044"   PointId:"P83044" PointType:""`
-	P83045                 string        `json:"p83045"   PointId:"P83045" PointType:""`
+	P83043                 api.Float        `json:"p83043"   PointId:"P83043" PointType:""`
+	P83044                 api.Float        `json:"p83044"   PointId:"P83044" PointType:""`
+	P83045                 api.Float        `json:"p83045"   PointId:"P83045" PointType:""`
 	P83072Map              api.UnitValue `json:"p83072_map"   PointId:"p83072" PointType:""`
 	P83072MapVirgin        api.UnitValue `json:"p83072_map_virgin"  PointIgnore:"true"`
 	P83073Map              api.UnitValue `json:"p83073_map"   PointId:"p83073" PointType:""`
@@ -136,7 +136,7 @@ type ResultData struct {
 	P83101MapVirgin        api.UnitValue `json:"p83101_map_virgin"  PointIgnore:"true"`
 	P83102Map              api.UnitValue `json:"p83102_map"   PointId:"p83102" PointType:""`
 	P83102MapVirgin        api.UnitValue `json:"p83102_map_virgin"  PointIgnore:"true"`
-	P83102Percent          string        `json:"p83102_percent"   PointId:"P83102Percent" PointType:""`
+	P83102Percent          api.Float        `json:"p83102_percent"   PointId:"P83102Percent" PointType:""`
 	P83105Map              api.UnitValue `json:"p83105_map"   PointId:"p83105" PointType:""`
 	P83105MapVirgin        api.UnitValue `json:"p83105_map_virgin"  PointIgnore:"true"`
 	P83106Map              api.UnitValue `json:"p83106_map"   PointId:"p83106" PointType:""`
@@ -149,38 +149,38 @@ type ResultData struct {
 	P83119MapVirgin        api.UnitValue `json:"p83119_map_virgin"  PointIgnore:"true"`
 	P83120Map              api.UnitValue `json:"p83120_map"   PointId:"p83120" PointType:""`
 	P83120MapVirgin        api.UnitValue `json:"p83120_map_virgin"  PointIgnore:"true"`
-	P83121                 string        `json:"p83121"   PointId:"P83121" PointType:""`
-	P83122                 string        `json:"p83122"   PointId:"P83122" PointType:""`
+	P83121                 api.Float        `json:"p83121"   PointId:"P83121" PointType:""`
+	P83122                 api.Float        `json:"p83122"   PointId:"P83122" PointType:""`
 	P83123Map              api.UnitValue `json:"p83123_map"   PointId:"p83123" PointType:""`
 	P83123MapVirgin        api.UnitValue `json:"p83123_map_virgin"  PointIgnore:"true"`
 	P83124Map              api.UnitValue `json:"p83124_map"   PointId:"p83124" PointType:""`
 	P83124MapVirgin        api.UnitValue `json:"p83124_map_virgin"  PointIgnore:"true"`
-	P83125                 string        `json:"p83125"   PointId:"P83125" PointType:""`
-	P83126                 string        `json:"p83126"   PointId:"P83126" PointType:""`
+	P83125                 api.Float        `json:"p83125"   PointId:"P83125" PointType:""`
+	P83126                 api.Float        `json:"p83126"   PointId:"P83126" PointType:""`
 	P83128MapVirgin        api.UnitValue `json:"p83128_map_virgin"  PointIgnore:"true"`
 	P83202Map              api.UnitValue `json:"p83202_map"   PointId:"p83202" PointType:""`
 	P83202MapVirgin        api.UnitValue `json:"p83202_map_virgin"  PointIgnore:"true"`
 	PercentPlanYear        api.Float     `json:"percent_plan_year"`
 	PlanEnergy             []string      `json:"plan_energy"`
-	PlanEnergyUnit         string        `json:"plan_energy_unit"`
+	PlanEnergyUnit         api.String        `json:"plan_energy_unit"`
 	PlanEnergyYear         api.UnitValue `json:"plan_energy_year"`
 	PowderReduce           api.UnitValue `json:"powder_reduce"`
 	PowderReduceTotal      api.UnitValue `json:"powder_reduce_total"   PointId:"powder_reduce_total" PointType:"PointTypeTotal"`
-	PowerChargeSetted      api.Integer   `json:"power_charge_setted"   PointId:"power_charge_setted" PointType:"PointTypeTotal"`
+	PowerChargeSetted      api.Bool   `json:"power_charge_setted"   PointId:"power_charge_setted" PointType:"PointTypeTotal"`
 	Producer               string        `json:"producer"`
 	PsCountryID            api.Integer   `json:"ps_country_id"`
 	PsFaultStatus          string        `json:"ps_fault_status"`
 	PsHealthStatus         string        `json:"ps_health_status"`
-	PsHolder               string        `json:"ps_holder"`
-	PsLocation             string        `json:"ps_location"`
-	PsName                 string        `json:"ps_name"`
-	PsShortName            string        `json:"ps_short_name"`
+	PsHolder               api.String        `json:"ps_holder"`
+	PsLocation             api.String        `json:"ps_location"`
+	PsName                 api.String        `json:"ps_name"`
+	PsShortName            api.String        `json:"ps_short_name"`
 	PsState                string        `json:"ps_state"`
 	PsType                 api.Integer   `json:"ps_type"`
-	PsTypeName             string        `json:"ps_type_name"`
+	PsTypeName             api.String        `json:"ps_type_name"`
 	PsWindLevel            string        `json:"ps_wind_level"`
 	PsWindPos              string        `json:"ps_wind_pos"`
-	RecoreCreateTime       string        `json:"recore_create_time"`
+	RecordCreateTime       api.DateTime        `json:"recore_create_time"`
 	ReportType             string        `json:"report_type"`
 	RobotNumSweepCapacity  struct {
 		Num           api.Integer   `json:"num"`
@@ -188,25 +188,25 @@ type ResultData struct {
 	} `json:"robot_num_sweep_capacity"`
 	SafeStartDate                 api.DateTime  `json:"safe_start_date"`
 	SelfConsumptionOffsetReminder api.Integer   `json:"self_consumption_offset_reminder"`
-	ShippingAddress               string        `json:"shipping_address"`
-	ShippingZipCode               string        `json:"shipping_zip_code"`
+	ShippingAddress               api.String        `json:"shipping_address"`
+	ShippingZipCode               api.String        `json:"shipping_zip_code"`
 	So2Reduce                     api.UnitValue `json:"so2_reduce"`
 	So2ReduceTotal                api.UnitValue `json:"so2_reduce_total"   PointId:"so2_reduce_total" PointType:"PointTypeTotal"`
 	StorageInverterData           []struct {
-		CommunicationDevSn      string        `json:"communication_dev_sn"`
+		CommunicationDevSn      api.String        `json:"communication_dev_sn"`
 		DevFaultStatus          api.Integer   `json:"dev_fault_status"`
 		DevStatus               api.Integer   `json:"dev_status"`
 		DeviceCode              api.Integer   `json:"device_code"`
-		DeviceModelCode         string        `json:"device_model_code"`
-		DeviceName              string        `json:"device_name"`
+		DeviceModelCode         api.String        `json:"device_model_code"`
+		DeviceName              api.String        `json:"device_name"`
 		DeviceState             string        `json:"device_state"`
 		DeviceType              api.Integer   `json:"device_type"`
-		DrmStatus               string        `json:"drm_status"`
-		DrmStatusName           string        `json:"drm_status_name"`
+		DrmStatus               api.Integer        `json:"drm_status"`
+		DrmStatusName           api.String        `json:"drm_status_name"`
 		EnergyFlow              []string      `json:"energy_flow"`
 		HasAmmeter              api.Integer   `json:"has_ammeter"`
 		InstallerDevFaultStatus api.Integer   `json:"installer_dev_fault_status"`
-		InverterSn              string        `json:"inverter_sn"`
+		InverterSn              api.String        `json:"inverter_sn"`
 		OwnerDevFaultStatus     api.Integer   `json:"owner_dev_fault_status"`
 		P13003Map               api.UnitValue `json:"p13003_map"   PointId:"p13003" PointType:"PointTypeInstant"`
 		P13003MapVirgin         api.UnitValue `json:"p13003_map_virgin"  PointIgnore:"true"`
@@ -220,20 +220,20 @@ type ResultData struct {
 		P13121MapVirgin         api.UnitValue `json:"p13121_map_virgin"  PointIgnore:"true"`
 		P13126Map               api.UnitValue `json:"p13126_map"   PointId:"p13126" PointType:"PointTypeInstant"`
 		P13126MapVirgin         api.UnitValue `json:"p13126_map_virgin"  PointIgnore:"true"`
-		P13141                  string        `json:"p13141"   PointId:"P13141" PointType:"PointTypeInstant"`
-		P13142                  string        `json:"p13142"   PointId:"P13142" PointType:"PointTypeInstant"`
+		P13141                  api.Float        `json:"p13141"   PointId:"P13141" PointType:"PointTypeInstant"`
+		P13142                  api.Float        `json:"p13142"   PointId:"P13142" PointType:"PointTypeInstant"`
 		P13149Map               api.UnitValue `json:"p13149_map"   PointId:"p13149" PointType:"PointTypeInstant"`
 		P13149MapVirgin         api.UnitValue `json:"p13149_map_virgin"  PointIgnore:"true"`
 		P13150Map               api.UnitValue `json:"p13150_map"   PointId:"p13150" PointType:"PointTypeInstant"`
 		P13150MapVirgin         api.UnitValue `json:"p13150_map_virgin"  PointIgnore:"true"`
-		P13155                  string        `json:"p13155"   PointId:"P13155" PointType:"PointTypeInstant"`
-		PsKey                   string        `json:"ps_key"`
-		UpdateTime              string        `json:"update_time"`
+		P13155                  api.Float        `json:"p13155"   PointId:"P13155" PointType:"PointTypeInstant"`
+		PsKey                   api.PsKey        `json:"ps_key"`
+		UpdateTime              api.DateTime        `json:"update_time"`
 		UUID                    api.Integer   `json:"uuid"`
 	} `json:"storage_inverter_data"`
 	SysScheme            api.Integer   `json:"sys_scheme"`
 	TimeZoneID           api.Integer   `json:"time_zone_id"`
-	Timezone             string        `json:"timezone"`
+	Timezone             api.String        `json:"timezone"`
 	TodayEnergy          api.UnitValue `json:"today_energy"   PointId:"today_energy" PointType:"PointTypeDaily"`
 	TodayEnergyVirgin    api.UnitValue `json:"today_energy_virgin"  PointIgnore:"true"`
 	TodayIncome          api.UnitValue `json:"today_income"   PointId:"today_income" PointType:"PointTypeDaily"`
@@ -244,16 +244,16 @@ type ResultData struct {
 	TreeReduce           api.UnitValue `json:"tree_reduce"`
 	TreeReduceTotal      api.UnitValue `json:"tree_reduce_total"   PointId:"tree_reduce_total" PointType:"PointTypeTotal"`
 	TuvLevel             string        `json:"tuv_level"`
-	ValidFlag            string        `json:"valid_flag"`
+	ValidFlag            api.Bool        `json:"valid_flag"`
 	WaitAssignOrderCount api.Integer   `json:"wait_assign_order_count"`
 	WaterReduce          api.UnitValue `json:"water_reduce"`
 	WaterReduceTotal     api.UnitValue `json:"water_reduce_total"   PointId:"water_reduce_total" PointType:"PointTypeTotal"`
 	WgsLatitude          api.Float     `json:"wgs_latitude"`
 	WgsLongitude         api.Float     `json:"wgs_longitude"`
-	Year                 string        `json:"year"`
+	Year                 api.Integer        `json:"year"`
 	ZfzyMap              api.UnitValue `json:"zfzy_map"`
 	ZfzyMapVirgin        api.UnitValue `json:"zfzy_map_virgin"  PointIgnore:"true"`
-	ZipCode              string        `json:"zip_code"`
+	ZipCode              api.String        `json:"zip_code"`
 	ZjzzMap              api.UnitValue `json:"zjzz_map"`
 	ZjzzMapVirgin        api.UnitValue `json:"zjzz_map_virgin"  PointIgnore:"true"`
 }
@@ -295,26 +295,26 @@ func (e *EndPoint) GetData() api.DataMap {
 	for range Only.Once {
 		name := fmt.Sprintf("getPsDetail.%s", e.Request.PsId.String())
 
-		uv := api.SetUnitValueString(e.Response.ResultData.P83012Value, e.Response.ResultData.P83012Unit)
+		uv := api.SetUnitValueFloat(e.Response.ResultData.P83012Value.Value(), e.Response.ResultData.P83012Unit.Value())
 		entries.AddUnitValue(name + ".p83012", e.Request.PsId.String(), "p83012", "", api.NewDateTime(""), uv)
 
-		uv = api.SetUnitValueString(e.Response.ResultData.P83013Value, e.Response.ResultData.P83013Unit)
+		uv = api.SetUnitValueFloat(e.Response.ResultData.P83013Value.Value(), e.Response.ResultData.P83013Unit.Value())
 		entries.AddUnitValue(name + ".p83013", e.Request.PsId.String(), "p83013", "", api.NewDateTime(""), uv)
 
-		uv = api.SetUnitValueString(e.Response.ResultData.P83036Value, e.Response.ResultData.P83036Unit)
+		uv = api.SetUnitValueFloat(e.Response.ResultData.P83036Value.Value(), e.Response.ResultData.P83036Unit.Value())
 		entries.AddUnitValue(name + ".p83036", e.Request.PsId.String(), "p83036", "", api.NewDateTime(""), uv)
 
-		uv = api.SetUnitValueString(e.Response.ResultData.P83016, e.Response.ResultData.P83016Unit)
+		uv = api.SetUnitValueFloat(e.Response.ResultData.P83016.Value(), e.Response.ResultData.P83016Unit.Value())
 		entries.AddUnitValue(name + ".p83016", e.Request.PsId.String(), "p83016", "", api.NewDateTime(""), uv)
 
-		uv = api.SetUnitValueString(e.Response.ResultData.P83017, e.Response.ResultData.P83017Unit)
+		uv = api.SetUnitValueFloat(e.Response.ResultData.P83017.Value(), e.Response.ResultData.P83017Unit.Value())
 		entries.AddUnitValue(name + ".p83017", e.Request.PsId.String(), "p83017", "", api.NewDateTime(""), uv)
 
 
 		entries.StructToPoints(e.Response.ResultData, name, e.Request.PsId.String(), time.Time{})
 
 		for _, sid := range e.Response.ResultData.StorageInverterData {
-			entries.StructToPoints(sid, name + ".StorageInverterData." + sid.PsKey, sid.PsKey, time.Time{})
+			entries.StructToPoints(sid, name + ".StorageInverterData." + sid.PsKey.Value(), sid.PsKey.Value(), time.Time{})
 		}
 	}
 	return entries
diff --git a/iSolarCloud/AppService/getPsDetailWithPsType/data.go b/iSolarCloud/AppService/getPsDetailWithPsType/data.go
index ee4ee26e4..38f1400ac 100644
--- a/iSolarCloud/AppService/getPsDetailWithPsType/data.go
+++ b/iSolarCloud/AppService/getPsDetailWithPsType/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
 }
 
 type ResultData struct {
-	BatteryLevelPercent         string        `json:"battery_level_percent" PointId:"BatteryLevelPercent" PointType:"PointTypeBoot"`
+	BatteryLevelPercent         api.Integer   `json:"battery_level_percent" PointId:"BatteryLevelPercent" PointType:"PointTypeBoot"`
 	ChargingDischargingPowerMap api.UnitValue `json:"charging_discharging_power_map" PointId:"ChargingDischargingPowerMap" PointType:"PointTypeInstant"`
 	Co2ReduceTotal              api.UnitValue `json:"co2_reduce_total" PointId:"Co2ReduceTotal" PointType:"PointTypeTotal"`
 	CoalReduceTotal             api.UnitValue `json:"coal_reduce_total" PointId:"CoalReduceTotal" PointType:"PointTypeTotal"`
@@ -36,12 +36,12 @@ type ResultData struct {
 	EnergyScheme                interface{}   `json:"energy_scheme"`
 	GcjLatitude                 api.Float     `json:"gcj_latitude" PointId:"GcjLatitude" PointType:"PointTypeBoot"`
 	GcjLongitude                api.Float     `json:"gcj_longitude" PointId:"GcjLongitude" PointType:"PointTypeBoot"`
-	HasAmmeter                  api.Integer   `json:"has_ammeter" PointId:"HasAmmeter" PointType:"PointTypeBoot"`
+	HasAmmeter                  api.Bool      `json:"has_ammeter" PointId:"HasAmmeter" PointType:"PointTypeBoot"`
 	HouseholdInverterData       interface{}   `json:"household_inverter_data"`
 	InstallerPsFaultStatus      string        `json:"installer_ps_fault_status" PointId:"InstallerPsFaultStatus" PointType:"PointTypeBoot"`
-	IsHaveEsInverter            api.Integer   `json:"is_have_es_inverter" PointId:"IsHaveEsInverter" PointType:"PointTypeBoot"`
-	IsSingleInverter            api.Integer   `json:"is_single_inverter" PointId:"IsSingleInverter" PointType:"PointTypeBoot"`
-	IsTransformSystem           string        `json:"is_transform_system" PointId:"IsTransformSystem" PointType:"PointTypeBoot"`
+	IsHaveEsInverter            api.Bool      `json:"is_have_es_inverter" PointId:"IsHaveEsInverter" PointType:"PointTypeBoot"`
+	IsSingleInverter            api.Bool      `json:"is_single_inverter" PointId:"IsSingleInverter" PointType:"PointTypeBoot"`
+	IsTransformSystem           api.Bool      `json:"is_transform_system" PointId:"IsTransformSystem" PointType:"PointTypeBoot"`
 	Latitude                    api.Float     `json:"latitude" PointId:"Latitude" PointType:"PointTypeBoot"`
 	LoadPowerMap                api.UnitValue `json:"load_power_map" PointId:"LoadPowerMap" PointType:"PointTypeInstant"`
 	LoadPowerMapVirgin          api.UnitValue `json:"load_power_map_virgin"  PointIgnore:"true"`
@@ -49,7 +49,7 @@ type ResultData struct {
 	MapLatitude                 api.Float     `json:"map_latitude" PointId:"MapLatitude" PointType:"PointTypeBoot"`
 	MapLongitude                api.Float     `json:"map_longitude" PointId:"MapLongitude" PointType:"PointTypeBoot"`
 	MeterReduceTotal            api.UnitValue `json:"meter_reduce_total" PointId:"MeterReduceTotal" PointType:"PointTypeTotal"`
-	MobleTel                    string        `json:"moble_tel" PointId:"MobleTel" PointType:"PointTypeBoot"`
+	MobileTel                   api.String    `json:"moble_tel" PointId:"MobleTel" PointType:"PointTypeBoot"`
 	MonthEnergy                 api.UnitValue `json:"month_energy" PointId:"MonthEnergy" PointType:"PointTypeMonthly"`
 	MonthEnergyVirgin           api.UnitValue `json:"month_energy_virgin"  PointIgnore:"true"`
 	MonthIncome                 api.UnitValue `json:"month_income" PointId:"MonthIncome" PointType:"PointTypeMonthly"`
@@ -59,14 +59,14 @@ type ResultData struct {
 	P83081MapVirgin             api.UnitValue `json:"p83081_map_virgin"  PointIgnore:"true"`
 	P83102Map                   api.UnitValue `json:"p83102_map" PointId:"P83102Map" PointType:"PointTypeInstant"`
 	P83102MapVirgin             api.UnitValue `json:"p83102_map_virgin"  PointIgnore:"true"`
-	P83102Percent               string        `json:"p83102_percent" PointId:"P83102Percent" PointType:"PointTypeInstant"`
+	P83102Percent               api.Float     `json:"p83102_percent" PointId:"P83102Percent" PointType:"PointTypeInstant"`
 	P83118Map                   api.UnitValue `json:"p83118_map" PointId:"P83118Map" PointType:"PointTypeInstant"`
 	P83118MapVirgin             api.UnitValue `json:"p83118_map_virgin"  PointIgnore:"true"`
 	P83119Map                   api.UnitValue `json:"p83119_map" PointId:"P83119Map" PointType:"PointTypeInstant"`
 	P83119MapVirgin             api.UnitValue `json:"p83119_map_virgin"  PointIgnore:"true"`
 	P83120Map                   api.UnitValue `json:"p83120_map" PointId:"P83120Map" PointType:"PointTypeInstant"`
 	P83120MapVirgin             api.UnitValue `json:"p83120_map_virgin"  PointIgnore:"true"`
-	P83122                      string        `json:"p83122" PointId:"P83122" PointType:"PointTypeInstant"`
+	P83122                      api.Float     `json:"p83122" PointId:"P83122" PointType:"PointTypeInstant"`
 	P83124Map                   api.UnitValue `json:"p83124_map" PointId:"P83124Map" PointType:"PointTypeInstant"`
 	P83124MapVirgin             api.UnitValue `json:"p83124_map_virgin"  PointIgnore:"true"`
 	P83202Map                   api.UnitValue `json:"p83202_map" PointId:"P83202Map" PointType:"PointTypeInstant"`
@@ -76,36 +76,36 @@ type ResultData struct {
 	PowerGridPowerMap           api.UnitValue `json:"power_grid_power_map" PointId:"PowerGridPowerMap" PointType:"PointTypeInstant"`
 	PowerGridPowerMapVirgin     api.UnitValue `json:"power_grid_power_map_virgin"  PointIgnore:"true"`
 	PsCountryID                 api.Integer   `json:"ps_country_id" PointId:"PsCountryID" PointType:"PointTypeBoot"`
-	PsDeviceType                string        `json:"ps_device_type" PointId:"PsDeviceType" PointType:"PointTypeBoot"`
+	PsDeviceType                api.Integer   `json:"ps_device_type" PointId:"PsDeviceType" PointType:"PointTypeBoot"`
 	PsFaultStatus               string        `json:"ps_fault_status" PointId:"PsFaultStatus" PointType:"PointTypeBoot"`
 	PsHealthStatus              string        `json:"ps_health_status" PointId:"PsHealthStatus" PointType:"PointTypeBoot"`
-	PsLocation                  string        `json:"ps_location" PointId:"PsLocation" PointType:"PointTypeBoot"`
-	PsName                      string        `json:"ps_name" PointId:"PsName" PointType:"PointTypeBoot"`
-	PsPsKey                     string        `json:"ps_ps_key" PointId:"PsPsKey" PointType:"PointTypeBoot"`
+	PsLocation                  api.String    `json:"ps_location" PointId:"PsLocation" PointType:"PointTypeBoot"`
+	PsName                      api.String    `json:"ps_name" PointId:"PsName" PointType:"PointTypeBoot"`
+	PsPsKey                     api.PsKey     `json:"ps_ps_key" PointId:"PsPsKey" PointType:"PointTypeBoot"`
 	PsState                     string        `json:"ps_state" PointId:"PsState" PointType:"PointTypeBoot"`
 	PsType                      api.Integer   `json:"ps_type" PointId:"PsType" PointType:"PointTypeBoot"`
 	PvPowerMap                  api.UnitValue `json:"pv_power_map" PointId:"PvPowerMap" PointType:"PointTypeInstant"`
 	PvPowerMapVirgin            api.UnitValue `json:"pv_power_map_virgin"  PointIgnore:"true"`
 	RobotNumSweepCapacity       struct {
-		Num           api.Integer   `json:"num" PointId:"Num" PointType:"PointTypeBoot"`
-		SweepCapacity api.Float `json:"sweep_capacity" PointId:"SweepCapacity" PointType:"PointTypeBoot"`
+		Num           api.Integer `json:"num" PointId:"Num" PointType:"PointTypeBoot"`
+		SweepCapacity api.Float   `json:"sweep_capacity" PointId:"SweepCapacity" PointType:"PointTypeBoot"`
 	} `json:"robot_num_sweep_capacity"`
 	SelfConsumptionOffsetReminder api.Integer   `json:"self_consumption_offset_reminder" PointId:"SelfConsumptionOffsetReminder" PointType:"PointTypeBoot"`
 	So2ReduceTotal                api.UnitValue `json:"so2_reduce_total" PointId:"So2ReduceTotal" PointType:"PointTypeTotal"`
 	StorageInverterData           []struct {
-		CommunicationDevSn      string        `json:"communication_dev_sn" PointId:"CommunicationDevSn" PointType:"PointTypeBoot"`
+		CommunicationDevSn      api.String    `json:"communication_dev_sn" PointId:"CommunicationDevSn" PointType:"PointTypeBoot"`
 		DevStatus               api.Integer   `json:"dev_status" PointId:"DevStatus" PointType:"PointTypeBoot"`
 		DeviceCode              api.Integer   `json:"device_code" PointId:"DeviceCode" PointType:"PointTypeBoot"`
-		DeviceModelCode         string        `json:"device_model_code" PointId:"DeviceModelCode" PointType:"PointTypeBoot"`
-		DeviceName              string        `json:"device_name" PointId:"DeviceName" PointType:"PointTypeBoot"`
+		DeviceModelCode         api.String    `json:"device_model_code" PointId:"DeviceModelCode" PointType:"PointTypeBoot"`
+		DeviceName              api.String    `json:"device_name" PointId:"DeviceName" PointType:"PointTypeBoot"`
 		DeviceState             string        `json:"device_state" PointId:"DeviceState" PointType:"PointTypeBoot"`
 		DeviceType              api.Integer   `json:"device_type" PointId:"DeviceType" PointType:"PointTypeBoot"`
-		DrmStatus               string        `json:"drm_status" PointId:"DrmStatus" PointType:"PointTypeBoot"`
-		DrmStatusName           string        `json:"drm_status_name" PointId:"DrmStatusName" PointType:"PointTypeBoot"`
+		DrmStatus               api.Integer   `json:"drm_status" PointId:"DrmStatus" PointType:"PointTypeBoot"`
+		DrmStatusName           api.String    `json:"drm_status_name" PointId:"DrmStatusName" PointType:"PointTypeBoot"`
 		EnergyFlow              []string      `json:"energy_flow"`
 		HasAmmeter              api.Integer   `json:"has_ammeter" PointId:"HasAmmeter" PointType:"PointTypeBoot"`
 		InstallerDevFaultStatus api.Integer   `json:"installer_dev_fault_status" PointId:"InstallerDevFaultStatus" PointType:"PointTypeBoot"`
-		InverterSn              string        `json:"inverter_sn" PointId:"InverterSn" PointType:"PointTypeBoot"`
+		InverterSn              api.String    `json:"inverter_sn" PointId:"InverterSn" PointType:"PointTypeBoot"`
 		OwnerDevFaultStatus     api.Integer   `json:"owner_dev_fault_status" PointId:"OwnerDevFaultStatus" PointType:"PointTypeBoot"`
 		P13003Map               api.UnitValue `json:"p13003_map" PointId:"P13003Map" PointType:"PointTypeInstant"`
 		P13003MapVirgin         api.UnitValue `json:"p13003_map_virgin"  PointIgnore:"true"`
@@ -115,12 +115,12 @@ type ResultData struct {
 		P13121MapVirgin         api.UnitValue `json:"p13121_map_virgin"  PointIgnore:"true"`
 		P13126Map               api.UnitValue `json:"p13126_map" PointId:"P13126Map" PointType:"PointTypeInstant"`
 		P13126MapVirgin         api.UnitValue `json:"p13126_map_virgin"  PointIgnore:"true"`
-		P13141                  string        `json:"p13141" PointId:"P13141" PointType:"PointTypeInstant"`
+		P13141                  api.Float     `json:"p13141" PointId:"P13141" PointType:"PointTypeInstant"`
 		P13149Map               api.UnitValue `json:"p13149_map" PointId:"P13149Map" PointType:"PointTypeInstant"`
 		P13149MapVirgin         api.UnitValue `json:"p13149_map_virgin"  PointIgnore:"true"`
 		P13150Map               api.UnitValue `json:"p13150_map" PointId:"P13150Map" PointType:"PointTypeInstant"`
 		P13150MapVirgin         api.UnitValue `json:"p13150_map_virgin"  PointIgnore:"true"`
-		PsKey                   string        `json:"ps_key" PointId:"PsKey" PointType:"PointTypeBoot"`
+		PsKey                   api.PsKey     `json:"ps_key" PointId:"PsKey" PointType:"PointTypeBoot"`
 		UUID                    api.Integer   `json:"uuid" PointId:"UUID" PointType:"PointTypeBoot"`
 	} `json:"storage_inverter_data"`
 	TodayEnergy       api.UnitValue `json:"today_energy" PointId:"TodayEnergy" PointType:"PointTypeDaily"`
@@ -192,11 +192,11 @@ func (e *EndPoint) GetDataTable() output.Table {
 		keys := api.GetStructKeys(e.Response.ResultData)
 		for _, n := range keys.Sort() {
 			pn := api.PointId(n)
-			p := api.GetPoint(e.Response.ResultData.PsPsKey, pn)
+			p := api.GetPoint(e.Response.ResultData.PsPsKey.Value(), pn)
 			if p.Valid {
 				_ = table.AddRow(
 					now,
-					api.NameDevicePoint(e.Response.ResultData.PsPsKey, pn),
+					api.NameDevicePoint(e.Response.ResultData.PsPsKey.Value(), pn),
 					p.Name,
 					keys[pn].Value,
 					p.Unit,
@@ -207,7 +207,7 @@ func (e *EndPoint) GetDataTable() output.Table {
 
 			_ = table.AddRow(
 				now,
-				api.NameDevicePoint(e.Response.ResultData.PsPsKey, pn),
+				api.NameDevicePoint(e.Response.ResultData.PsPsKey.Value(), pn),
 				api.PointToName(pn),
 				keys[pn].Value,
 				keys[pn].Unit,
@@ -223,11 +223,11 @@ func (e *EndPoint) GetDataTable() output.Table {
 			keys = api.GetStructKeys(sid)
 			for _, n := range keys.Sort() {
 				pn := api.PointId(n)
-				p := api.GetPoint(sid.PsKey, pn)
+				p := api.GetPoint(sid.PsKey.Value(), pn)
 				if p.Valid {
 					_ = table.AddRow(
 						now,
-						api.NameDevicePoint(sid.PsKey, pn),
+						api.NameDevicePoint(sid.PsKey.Value(), pn),
 						p.Name,
 						keys[pn].Value,
 						p.Unit,
@@ -238,7 +238,7 @@ func (e *EndPoint) GetDataTable() output.Table {
 
 				_ = table.AddRow(
 					now,
-					api.NameDevicePoint(sid.PsKey, pn),
+					api.NameDevicePoint(sid.PsKey.Value(), pn),
 					api.PointToName(pn),
 					keys[pn].Value,
 					keys[pn].Unit,
@@ -267,26 +267,26 @@ func (e *EndPoint) GetData() api.DataMap {
 	entries := api.NewDataMap()
 
 	for range Only.Once {
-		name := fmt.Sprintf("getPsDetailWithPsType.%s", e.Response.ResultData.PsPsKey)
-		entries.StructToPoints(e.Response.ResultData, name, e.Response.ResultData.PsPsKey, time.Time{})
+		name := fmt.Sprintf("getPsDetailWithPsType.%s", e.Response.ResultData.PsPsKey.Value())
+		entries.StructToPoints(e.Response.ResultData, name, e.Response.ResultData.PsPsKey.Value(), time.Time{})
 
 		for _, sid := range e.Response.ResultData.StorageInverterData {
-			entries.StructToPoints(sid, name + ".StorageInverterData." + sid.PsKey, sid.PsKey, time.Time{})
+			entries.StructToPoints(sid, name + ".StorageInverterData." + sid.PsKey.Value(), sid.PsKey.Value(), time.Time{})
 		}
 	}
 	return entries
 }
 
 func (e *EndPoint) GetPsKeys() []string {
-	ret := []string{e.Response.ResultData.PsPsKey}
+	ret := []string{e.Response.ResultData.PsPsKey.Value()}
 	for _, l := range e.Response.ResultData.StorageInverterData {
-		ret = append(ret, l.PsKey)
+		ret = append(ret, l.PsKey.Value())
 	}
 	return ret
 }
 
 func (e *EndPoint) GetPsName() string {
-	return e.Response.ResultData.PsName
+	return e.Response.ResultData.PsName.Value()
 }
 
 func (e *EndPoint) GetPsState() string {
@@ -294,31 +294,31 @@ func (e *EndPoint) GetPsState() string {
 }
 
 func (e *EndPoint) GetPsKey() string {
-	return e.Response.ResultData.PsPsKey
+	return e.Response.ResultData.PsPsKey.Value()
 }
 
 func (e *EndPoint) GetDeviceModelCode() string {
-	ret := e.Response.ResultData.PsPsKey
+	ret := e.Response.ResultData.PsPsKey.Value()
 	for _, l := range e.Response.ResultData.StorageInverterData {
-		ret = l.DeviceModelCode
+		ret = l.DeviceModelCode.Value()
 		break
 	}
 	return ret
 }
 
 func (e *EndPoint) GetDeviceName() string {
-	ret := e.Response.ResultData.PsPsKey
+	ret := e.Response.ResultData.PsPsKey.Value()
 	for _, l := range e.Response.ResultData.StorageInverterData {
-		ret = l.DeviceName
+		ret = l.DeviceName.Value()
 		break
 	}
 	return ret
 }
 
 func (e *EndPoint) GetDeviceSerial() string {
-	ret := e.Response.ResultData.PsPsKey
+	ret := e.Response.ResultData.PsPsKey.Value()
 	for _, l := range e.Response.ResultData.StorageInverterData {
-		ret = l.InverterSn
+		ret = l.InverterSn.Value()
 		break
 	}
 	return ret
diff --git a/iSolarCloud/AppService/getPsHealthState/data.go b/iSolarCloud/AppService/getPsHealthState/data.go
index dcfb94cc3..944785e3c 100644
--- a/iSolarCloud/AppService/getPsHealthState/data.go
+++ b/iSolarCloud/AppService/getPsHealthState/data.go
@@ -1,6 +1,7 @@
 package getPsHealthState
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
 	"fmt"
 )
@@ -9,7 +10,7 @@ const Url = "/v1/powerStationService/getPsHealthState"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPsList/data.go b/iSolarCloud/AppService/getPsList/data.go
index b8ad32c2a..ddd3af8bc 100644
--- a/iSolarCloud/AppService/getPsList/data.go
+++ b/iSolarCloud/AppService/getPsList/data.go
@@ -37,15 +37,15 @@ type ResultData struct {
 		Co2ReduceTotal            api.UnitValue `json:"co2_reduce_total" PointId:"co2_reduce_total" PointType:"PointTypeTotal"`
 		CurrPower                 api.UnitValue `json:"curr_power" PointId:"curr_power" PointType:""`
 		DailyIrradiation          api.UnitValue `json:"daily_irradiation" PointId:"daily_irradiation" PointType:"PointTypeDaily"`
-		DailyIrradiationVirgin    interface{}   `json:"daily_irradiation_virgin" PointId:"daily_irradiation_virgin" PointType:"PointTypeDaily"`
-		DesignCapacity            string        `json:"design_capacity" PointId:"design_capacity" PointType:""`
-		DesignCapacityUnit        string        `json:"design_capacity_unit" PointId:"design_capacity_unit" PointType:""`
+		DailyIrradiationVirgin    api.Float   `json:"daily_irradiation_virgin" PointId:"daily_irradiation_virgin" PointType:"PointTypeDaily"`
+		DesignCapacity            api.Float        `json:"design_capacity" PointId:"design_capacity" PointType:""`
+		DesignCapacityUnit        api.String        `json:"design_capacity_unit" PointId:"design_capacity_unit" PointType:""`
 		DesignCapacityVirgin      api.Float     `json:"design_capacity_virgin" PointId:"design_capacity_virgin" PointType:""`
 		EquivalentHour            api.UnitValue `json:"equivalent_hour" PointId:"equivalent_hour" PointType:"PointTypeDaily"`
-		EsDisenergy               api.UnitValue `json:"es_discharge_energy" PointId:"es_discharge_energy" PointAlias:"p83089" PointType:""`
+		EsDisenergy               api.UnitValue `json:"es_disenergy" PointId:"es_discharge_energy" PointAlias:"p83089" PointType:""`
 		EsEnergy                  api.UnitValue `json:"es_energy" PointId:"es_energy" PointAlias:"p83120" PointType:""`
 		EsPower                   api.UnitValue `json:"es_power" PointId:"es_power" PointAlias:"p83081" PointType:""`
-		EsTotalDisenergy          api.UnitValue `json:"es_total_discharge_energy" PointId:"es_total_discharge_energy" PointAlias:"p83095" PointType:"PointTypeTotal"`
+		EsTotalDisenergy          api.UnitValue `json:"es_total_disenergy" PointId:"es_total_discharge_energy" PointAlias:"p83095" PointType:"PointTypeTotal"`
 		EsTotalEnergy             api.UnitValue `json:"es_total_energy" PointId:"es_total_energy" PointAlias:"p83127" PointType:"PointTypeTotal"`
 		ExpectInstallDate         api.DateTime        `json:"expect_install_date" PointId:"expect_install_date" PointType:""`
 		FaultAlarmOfflineDevCount api.Integer   `json:"fault_alarm_offline_dev_count" PointId:"fault_alarm_offline_dev_count" PointType:""`
@@ -60,8 +60,8 @@ type ResultData struct {
 			ID          api.Integer `json:"id"`
 			PicLanguage api.Integer `json:"pic_language"`
 			PicType     api.Integer `json:"pic_type"`
-			PictureName string      `json:"picture_name"`
-			PictureURL  string      `json:"picture_url"`
+			PictureName api.String      `json:"picture_name"`
+			PictureURL  api.String      `json:"picture_url"`
 			PsID        api.Integer `json:"ps_id"`
 			PsUnitUUID  interface{} `json:"ps_unit_uuid"`
 		} `json:"images"`
@@ -71,32 +71,32 @@ type ResultData struct {
 		InstallerAlarmCount    api.Integer   `json:"installer_alarm_count" PointId:"installer_alarm_count" PointType:""`
 		InstallerFaultCount    api.Integer   `json:"installer_fault_count" PointId:"installer_fault_count" PointType:""`
 		InstallerPsFaultStatus api.Integer   `json:"installer_ps_fault_status" PointId:"installer_ps_fault_status" PointType:""`
-		IsBankPs               api.Integer   `json:"is_bank_ps" PointId:"is_bank_ps" PointType:""`
-		IsTuv                  api.Integer   `json:"is_tuv" PointId:"is_tuv" PointType:""`
+		IsBankPs               api.Bool      `json:"is_bank_ps" PointId:"is_bank_ps" PointType:""`
+		IsTuv                  api.Bool      `json:"is_tuv" PointId:"is_tuv" PointType:""`
 		JoinYearInitElec       api.Float     `json:"join_year_init_elec" PointId:"join_year_init_elec" PointType:""`
 		Latitude               api.Float     `json:"latitude" PointId:"latitude" PointType:""`
-		Location               string        `json:"location" PointId:"location" PointType:""`
+		Location               api.String        `json:"location" PointId:"location" PointType:""`
 		Longitude              api.Float     `json:"longitude" PointId:"longitude" PointType:""`
 		MapLatitude            api.Float     `json:"map_latitude" PointId:"map_latitude" PointType:""`
 		MapLongitude           api.Float     `json:"map_longitude" PointId:"map_longitude" PointType:""`
 		MlpeFlag               api.Integer   `json:"mlpe_flag" PointId:"mlpe_flag" PointType:""`
-		Nmi                    interface{}   `json:"nmi" PointId:"nmi" PointType:""`
+		Nmi                    api.String   `json:"nmi" PointId:"nmi" PointType:""`
 		OfflineDevCount        api.Integer   `json:"offline_dev_count" PointId:"offline_dev_count" PointType:""`
 		OperateYear            interface{}   `json:"operate_year" PointId:"operate_year" PointType:""`
-		OperationBusName       interface{}   `json:"operation_bus_name" PointId:"operation_bus_name" PointType:""`
+		OperationBusName       api.String   `json:"operation_bus_name" PointId:"operation_bus_name" PointType:""`
 		OwnerAlarmCount        api.Integer   `json:"owner_alarm_count" PointId:"owner_alarm_count" PointType:""`
 		OwnerFaultCount        api.Integer   `json:"owner_fault_count" PointId:"owner_fault_count" PointType:""`
 		OwnerPsFaultStatus     api.Integer   `json:"owner_ps_fault_status" PointId:"owner_ps_fault_status" PointType:""`
-		P83022y                string        `json:"p83022y" PointId:"P83022" PointType:""`
-		P83046                 interface{}   `json:"p83046" PointId:"p83046" PointType:""`
-		P83048                 interface{}   `json:"p83048" PointId:"p83048" PointType:""`
-		P83049                 interface{}   `json:"p83049" PointId:"p83049" PointType:""`
-		P83050                 interface{}   `json:"p83050" PointId:"p83050" PointType:""`
-		P83051                 interface{}   `json:"p83051" PointId:"p83051" PointType:""`
-		P83054                 interface{}   `json:"p83054" PointId:"p83054" PointType:""`
-		P83055                 interface{}   `json:"p83055" PointId:"p83055" PointType:""`
-		P83067                 interface{}   `json:"p83067" PointId:"p83067" PointType:""`
-		P83070                 interface{}   `json:"p83070" PointId:"p83070" PointType:""`
+		P83022y                api.String        `json:"p83022y" PointId:"P83022" PointType:""`
+		P83046                 api.Float   `json:"p83046" PointId:"p83046" PointType:""`
+		P83048                 api.Float   `json:"p83048" PointId:"p83048" PointType:""`
+		P83049                 api.Float   `json:"p83049" PointId:"p83049" PointType:""`
+		P83050                 api.Float   `json:"p83050" PointId:"p83050" PointType:""`
+		P83051                 api.Float   `json:"p83051" PointId:"p83051" PointType:""`
+		P83054                 api.Float   `json:"p83054" PointId:"p83054" PointType:""`
+		P83055                 api.Float   `json:"p83055" PointId:"p83055" PointType:""`
+		P83067                 api.Float   `json:"p83067" PointId:"p83067" PointType:""`
+		P83070                 api.Float   `json:"p83070" PointId:"p83070" PointType:""`
 		P83076                 api.Float     `json:"p83076" PointId:"p83076" PointIgnore:"true"`		// Dupe of PvPower
 		P83077                 api.Float     `json:"p83077" PointId:"p83077" PointType:""`
 		P83081                 api.Float     `json:"p83081" PointId:"p83081" PointIgnore:"true"`		// Dupe of EsPower
@@ -119,26 +119,26 @@ type ResultData struct {
 		PsCountryID            api.Integer   `json:"ps_country_id" PointId:"ps_country_id" PointType:""`
 		PsFaultStatus          api.Integer   `json:"ps_fault_status" PointId:"ps_fault_status" PointType:""`
 		PsHealthStatus         string        `json:"ps_health_status" PointId:"ps_health_status" PointType:""`
-		PsHolder               string        `json:"ps_holder" PointId:"ps_holder" PointType:""`
+		PsHolder               api.String        `json:"ps_holder" PointId:"ps_holder" PointType:""`
 		PsID                   api.Integer   `json:"ps_id" PointId:"ps_id" PointType:""`
-		PsIsNotInit            string        `json:"ps_is_not_init" PointId:"ps_is_not_init" PointType:""`
-		PsName                 string        `json:"ps_name" PointId:"ps_name" PointType:""`
-		PsShortName            string        `json:"ps_short_name" PointId:"ps_short_name" PointType:""`
+		PsIsNotInit            api.Bool        `json:"ps_is_not_init" PointId:"ps_is_not_init" PointType:""`
+		PsName                 api.String        `json:"ps_name" PointId:"ps_name" PointType:""`
+		PsShortName            api.String        `json:"ps_short_name" PointId:"ps_short_name" PointType:""`
 		PsStatus               api.Integer   `json:"ps_status" PointId:"ps_status" PointType:""`
-		PsTimezone             string        `json:"ps_timezone" PointId:"ps_timezone" PointType:""`
+		PsTimezone             api.String        `json:"ps_timezone" PointId:"ps_timezone" PointType:""`
 		PsType                 api.Integer   `json:"ps_type" PointId:"ps_type" PointType:""`
 		PvEnergy               api.UnitValue `json:"pv_energy" PointId:"pv_energy" PointAlias:"p83077" PointType:""`
 		PvPower                api.UnitValue `json:"pv_power" PointId:"pv_power" PointAlias:"p83076" PointType:""`
 		Radiation              api.UnitValue `json:"radiation" PointId:"radiation" PointType:""`
-		RadiationVirgin        interface{}   `json:"radiation_virgin" PointId:"radiation_virgin" PointType:""`
-		RecoreCreateTime       string        `json:"recore_create_time" PointId:"recore_create_time" PointType:""`
+		RadiationVirgin        api.Float   `json:"radiation_virgin" PointId:"radiation_virgin" PointType:""`
+		RecordCreateTime       api.DateTime        `json:"recore_create_time" PointId:"recore_create_time" PointType:""`
 		SafeStartDate          api.DateTime        `json:"safe_start_date" PointId:"safe_start_date" PointType:""`
 		ShareType              string        `json:"share_type" PointId:"share_type" PointType:""`
-		ShippingAddress        string        `json:"shipping_address" PointId:"shipping_address" PointType:""`
-		ShippingZipCode        string        `json:"shipping_zip_code" PointId:"shipping_zip_code" PointType:""`
+		ShippingAddress        api.String        `json:"shipping_address" PointId:"shipping_address" PointType:""`
+		ShippingZipCode        api.String        `json:"shipping_zip_code" PointId:"shipping_zip_code" PointType:""`
 		TodayEnergy            api.UnitValue `json:"today_energy" PointId:"today_energy" PointType:"PointTypeDaily"`
 		TodayIncome            api.UnitValue `json:"today_income" PointId:"today_income" PointType:"PointTypeDaily"`
-		TotalCapcity           api.UnitValue `json:"total_capacity" PointId:"total_capacity" PointType:"PointTypeTotal"`
+		TotalCapacity           api.UnitValue `json:"total_capcity" PointId:"total_capacity" PointType:"PointTypeTotal"`
 		TotalEnergy            api.UnitValue `json:"total_energy" PointId:"total_energy" PointType:"PointTypeTotal"`
 		TotalIncome            api.UnitValue `json:"total_income" PointId:"total_income" PointType:"PointTypeTotal"`
 		TotalInitCo2Accelerate api.Float     `json:"total_init_co2_accelerate" PointId:"total_init_co2_accelerate" PointType:"PointTypeTotal"`
@@ -148,7 +148,7 @@ type ResultData struct {
 		ValidFlag              api.Integer   `json:"valid_flag" PointId:"valid_flag" PointType:""`
 		WgsLatitude            api.Float     `json:"wgs_latitude" PointId:"wgs_latitude" PointType:""`
 		WgsLongitude           api.Float     `json:"wgs_longitude" PointId:"wgs_longitude" PointType:""`
-		ZipCode                string        `json:"zip_code" PointId:"zip_code" PointType:""`
+		ZipCode                api.String        `json:"zip_code" PointId:"zip_code" PointType:""`
 	} `json:"pageList"`
 	RowCount api.Integer `json:"rowCount"`
 }
@@ -208,7 +208,7 @@ func (e *ResultData) GetPsName() []string {
 		}
 		for _, p := range e.PageList {
 			if p.PsID.Value() != 0 {
-				ret = append(ret, p.PsName)
+				ret = append(ret, p.PsName.Value())
 			}
 		}
 	}
@@ -224,7 +224,7 @@ func (e *ResultData) GetPsSerial() []string {
 		}
 		for _, p := range e.PageList {
 			if p.PsID.Value() != 0 {
-				ret = append(ret, p.PsShortName)
+				ret = append(ret, p.PsShortName.Value())
 			}
 		}
 	}
@@ -293,7 +293,7 @@ func (e *EndPoint) GetDataTable() output.Table {
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Radiation", p.Radiation.Value(), p.Radiation.Unit())
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Today Energy", p.TodayEnergy.Value(), p.TodayEnergy.Unit())
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Today Income", p.TodayIncome.Value(), p.TodayIncome.Unit())
-			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Total Capacity", p.TotalCapcity.Value(), p.TotalCapcity.Unit())
+			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Total Capacity", p.TotalCapacity.Value(), p.TotalCapacity.Unit())
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Total Energy", p.TotalEnergy.Value(), p.TotalEnergy.Unit())
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Total Income", p.TotalIncome.Value(), p.TotalIncome.Unit())
 			_ = table.AddRow(now, fmt.Sprintf("%s.%d", p.PsID.String(), 0), "Use Energy", p.UseEnergy.Value(), p.UseEnergy.Unit())
diff --git a/iSolarCloud/AppService/getPsListByName/data.go b/iSolarCloud/AppService/getPsListByName/data.go
index 267571b02..618b0fd6f 100644
--- a/iSolarCloud/AppService/getPsListByName/data.go
+++ b/iSolarCloud/AppService/getPsListByName/data.go
@@ -24,9 +24,9 @@ func (rd RequestData) Help() string {
 
 type ResultData []struct {
 	PsID         api.Integer  `json:"ps_id"`
-	PsName       string `json:"ps_name"`
-	PsShortName  string `json:"ps_short_name"`
-	PsTimezone   string `json:"ps_timezone"`
+	PsName       api.String `json:"ps_name"`
+	PsShortName  api.String `json:"ps_short_name"`
+	PsTimezone   api.String `json:"ps_timezone"`
 	PsTimezoneID api.Integer  `json:"ps_timezone_id"`
 	ShareType    string `json:"share_type"`
 }
diff --git a/iSolarCloud/AppService/getPsListStaticData/data.go b/iSolarCloud/AppService/getPsListStaticData/data.go
index 000476e11..a2384db38 100644
--- a/iSolarCloud/AppService/getPsListStaticData/data.go
+++ b/iSolarCloud/AppService/getPsListStaticData/data.go
@@ -31,15 +31,15 @@ type ResultData struct {
 		InstallDate            api.DateTime      `json:"install_date"`
 		InstallerPsFaultStatus api.Integer `json:"installer_ps_fault_status"`
 		Latitude               api.Float   `json:"latitude"`
-		Location               string      `json:"location"`
+		Location               api.String      `json:"location"`
 		Longitude              api.Float   `json:"longitude"`
 		MapLatitude            api.Float   `json:"map_latitude"`
 		MapLongitude           api.Float   `json:"map_longitude"`
 		OwnerPsFaultStatus     api.Integer `json:"owner_ps_fault_status"`
 		PsFaultStatus          api.Integer `json:"ps_fault_status"`
 		PsID                   api.Integer `json:"ps_id"`
-		PsName                 string      `json:"ps_name"`
-		PsShortName            string      `json:"ps_short_name"`
+		PsName                 api.String      `json:"ps_name"`
+		PsShortName            api.String      `json:"ps_short_name"`
 		PsStatus               api.Integer `json:"ps_status"`
 		PsType                 api.Integer `json:"ps_type"`
 		ValidFlag              api.Integer `json:"valid_flag"`
diff --git a/iSolarCloud/AppService/getPsReport/data.go b/iSolarCloud/AppService/getPsReport/data.go
index 7a89925d0..fe9aa9588 100644
--- a/iSolarCloud/AppService/getPsReport/data.go
+++ b/iSolarCloud/AppService/getPsReport/data.go
@@ -28,33 +28,33 @@ type ResultData struct {
 	PsDateRangeTotalData struct {
 		Co2Reduce                      api.Float     `json:"co2_reduce"`
 		Co2ReduceMap                   api.UnitValue `json:"co2_reduce_map"`
-		Co2ReduceOriginalUnit          string        `json:"co2_reduce_original_unit"`
+		Co2ReduceOriginalUnit          api.String        `json:"co2_reduce_original_unit"`
 		PowerQuantityTotal             api.Float     `json:"power_quantity_total"`
 		PowerQuantityTotalMap          api.UnitValue `json:"power_quantity_total_map"`
-		PowerQuantityTotalOriginalUnit string        `json:"power_quantity_total_original_unit"`
+		PowerQuantityTotalOriginalUnit api.String        `json:"power_quantity_total_original_unit"`
 		ProfitList                     ProfitList    `json:"profit_list"`
 		TotalProfit                    api.Float     `json:"total_profit"`
 	} `json:"ps_date_range_total_data"`
 	PsTotalData struct {
 		Co2Reduce                      api.Float     `json:"co2_reduce"`
 		Co2ReduceMap                   api.UnitValue `json:"co2_reduce_map"`
-		Co2ReduceOriginalUnit          string        `json:"co2_reduce_original_unit"`
-		MinDateID                      api.Integer   `json:"min_date_id"`
+		Co2ReduceOriginalUnit          api.String        `json:"co2_reduce_original_unit"`
+		MinDateID                      api.DateTime   `json:"min_date_id"`
 		PowerQuantityTotal             api.Float     `json:"power_quantity_total"`
 		PowerQuantityTotalMap          api.UnitValue `json:"power_quantity_total_map"`
-		PowerQuantityTotalOriginalUnit string        `json:"power_quantity_total_original_unit"`
+		PowerQuantityTotalOriginalUnit api.String        `json:"power_quantity_total_original_unit"`
 		ProfitList                     ProfitList    `json:"profit_list"`
 		TotalProfit                    api.Float     `json:"total_profit"`
 	} `json:"ps_total_data"`
 	ReportListData struct {
-		Co2ReduceUnit string `json:"co2_reduce_unit"`
+		Co2ReduceUnit api.String `json:"co2_reduce_unit"`
 		PageList      []struct {
 			Co2Reduce          api.Float  `json:"co2_reduce"`
-			IncomeUnitName     string     `json:"income_unit_name"`
+			IncomeUnitName     api.String     `json:"income_unit_name"`
 			PowerQuantityTotal api.Float  `json:"power_quantity_total"`
 			PsID               api.Integer`json:"ps_id"`
 			PsInstalledPower   api.Float  `json:"ps_installed_power"`
-			PsName             string     `json:"ps_name"`
+			PsName             api.String     `json:"ps_name"`
 			PsTotalCo2Reduce   api.Float  `json:"ps_total_co2_reduce"`
 			PsTotalPower       api.Float  `json:"ps_total_power"`
 			PsType             api.Integer`json:"ps_type"`
@@ -62,17 +62,17 @@ type ResultData struct {
 			ProfitList         ProfitList `json:"profit_list"`
 			TotalProfit        api.Float  `json:"total_profit"`
 		} `json:"pageList"`
-		PowerQuantityTotalUnit string `json:"power_quantity_total_unit"`
-		PsInstalledPowerUnit   string `json:"ps_installed_power_unit"`
-		PsTotalCo2ReduceUnit   string `json:"ps_total_co2_reduce_unit"`
-		PsTotalPowerUnit       string `json:"ps_total_power_unit"`
+		PowerQuantityTotalUnit api.String `json:"power_quantity_total_unit"`
+		PsInstalledPowerUnit   api.String `json:"ps_installed_power_unit"`
+		PsTotalCo2ReduceUnit   api.String `json:"ps_total_co2_reduce_unit"`
+		PsTotalPowerUnit       api.String `json:"ps_total_power_unit"`
 		RowCount               api.Integer  `json:"rowCount"`
 	} `json:"report_list_data"`
 }
 
 type ProfitList []struct {
 	IncomeUnitID   api.Integer   `json:"income_unit_id"`
-	IncomeUnitName string  `json:"income_unit_name"`
+	IncomeUnitName api.String  `json:"income_unit_name"`
 	TotalProfit    api.Float `json:"total_profit"`
 }
 
diff --git a/iSolarCloud/AppService/getPsUser/data.go b/iSolarCloud/AppService/getPsUser/data.go
index 7a28a73dc..3906766a7 100644
--- a/iSolarCloud/AppService/getPsUser/data.go
+++ b/iSolarCloud/AppService/getPsUser/data.go
@@ -23,72 +23,72 @@ func (rd RequestData) Help() string {
 }
 
 type ResultData struct {
-	BackgroundColor              api.Integer `json:"background_color"`
-	BloodType                    string      `json:"blood_type"`
-	CountryID                    api.Integer `json:"country_id"`
-	CountryName                  string      `json:"country_name"`
-	CreateDate                   api.DateTime      `json:"create_date"`
-	CreateUserID                 api.Integer `json:"create_user_id"`
-	DiseaseHis                   string      `json:"disease_his"`
-	Email                        string      `json:"email"`
-	EnglishName                  string      `json:"english_name"`
-	IsAgreeGdpr                  api.Integer `json:"is_agree_gdpr"`
-	IsCanModifyUserAccount       api.Integer `json:"is_can_modify_user_account"`
-	IsDst                        api.Integer `json:"is_dst"`
-	IsGdpr                       api.Integer `json:"is_gdpr"`
-	IsNewVersion                 api.Integer `json:"is_new_version"`
-	IsOpenProtocol               api.Integer `json:"is_open_protocol"`
-	IsReceiveNotice              api.Integer `json:"is_receive_notice"`
-	IsSharePosition              api.Integer `json:"is_share_position"`
-	IsValidMobileEmail           api.Integer `json:"is_valid_mobile_email"`
-	LackOfInformation            api.Integer `json:"lack_of_information"`
-	Language                     string      `json:"language"`
-	MobleTel                     string      `json:"moble_tel"`
-	OrgID                        api.Integer `json:"org_id"`
-	PhotoID                      api.Integer `json:"photo_id"`
-	PhotoURL                     string      `json:"photo_url"`
-	RootOrgID                    string      `json:"root_org_id"`
-	Sex                          string      `json:"sex"`
-	Stylename                    string      `json:"stylename"`
-	TimeZoneID                   api.Integer `json:"time_zone_id"`
-	Timezone                     string      `json:"timezone"`
-	UserAccount                  string      `json:"user_account"`
-	UserAccountModifyCount       api.Integer `json:"user_account_modify_count"`
-	UserAccountModifyRemainTimes api.Integer `json:"user_account_modify_remain_times"`
-	UserDealerOrgCode            interface{} `json:"user_dealer_org_code"`
-	UserID                       api.Integer `json:"user_id"`
-	UserLanguage                 string      `json:"user_language"`
-	UserLevel                    api.Integer `json:"user_level"`
-	UserName                     string      `json:"user_name"`
+	BackgroundColor              api.Integer  `json:"background_color"`
+	BloodType                    api.String   `json:"blood_type"`
+	CountryID                    api.Integer  `json:"country_id"`
+	CountryName                  api.String   `json:"country_name"`
+	CreateDate                   api.DateTime `json:"create_date"`
+	CreateUserID                 api.Integer  `json:"create_user_id"`
+	DiseaseHis                   api.String   `json:"disease_his"`
+	Email                        api.String   `json:"email"`
+	EnglishName                  api.String   `json:"english_name"`
+	IsAgreeGdpr                  api.Bool     `json:"is_agree_gdpr"`
+	IsCanModifyUserAccount       api.Bool     `json:"is_can_modify_user_account"`
+	IsDst                        api.Bool     `json:"is_dst"`
+	IsGdpr                       api.Bool     `json:"is_gdpr"`
+	IsNewVersion                 api.Bool     `json:"is_new_version"`
+	IsOpenProtocol               api.Bool     `json:"is_open_protocol"`
+	IsReceiveNotice              api.Bool     `json:"is_receive_notice"`
+	IsSharePosition              api.Bool     `json:"is_share_position"`
+	IsValidMobileEmail           api.Bool     `json:"is_valid_mobile_email"`
+	LackOfInformation            api.Integer  `json:"lack_of_information"`
+	Language                     api.String   `json:"language"`
+	MobileTel                    api.String   `json:"moble_tel"`
+	OrgID                        api.Integer  `json:"org_id"`
+	PhotoID                      api.Integer  `json:"photo_id"`
+	PhotoURL                     api.String   `json:"photo_url"`
+	RootOrgID                    api.Integer  `json:"root_org_id"`
+	Sex                          api.String   `json:"sex"`
+	Stylename                    api.String   `json:"stylename"`
+	TimeZoneID                   api.Integer  `json:"time_zone_id"`
+	Timezone                     api.String   `json:"timezone"`
+	UserAccount                  api.String   `json:"user_account"`
+	UserAccountModifyCount       api.Integer  `json:"user_account_modify_count"`
+	UserAccountModifyRemainTimes api.Integer  `json:"user_account_modify_remain_times"`
+	UserDealerOrgCode            api.String   `json:"user_dealer_org_code"`
+	UserID                       api.Integer  `json:"user_id"`
+	UserLanguage                 api.String   `json:"user_language"`
+	UserLevel                    api.Integer  `json:"user_level"`
+	UserName                     api.String   `json:"user_name"`
 	UserOrgInfo                  struct {
-		DealerOrgCode                 string      `json:"dealer_org_code"`
-		Email                         string      `json:"email"`
-		Installer                     string      `json:"installer"`
-		InstallerEmail                string      `json:"installer_email"`
-		InstallerPhone                string      `json:"installer_phone"`
-		IsCountryDefaultDealerOrgCode api.Integer `json:"is_country_default_dealer_org_code"`
-		MobleTel                      interface{} `json:"moble_tel"`
+		DealerOrgCode                 api.String  `json:"dealer_org_code"`
+		Email                         api.String  `json:"email"`
+		Installer                     api.String  `json:"installer"`
+		InstallerEmail                api.String  `json:"installer_email"`
+		InstallerPhone                api.String  `json:"installer_phone"`
+		IsCountryDefaultDealerOrgCode api.Bool    `json:"is_country_default_dealer_org_code"`
+		MobileTel                     api.String  `json:"moble_tel"`
 		OrgID                         api.Integer `json:"org_id"`
-		OrgIndexCode                  string      `json:"org_index_code"`
-		OrgName                       string      `json:"org_name"`
-		UpDealerEmail                 string      `json:"up_dealer_email"`
-		UpDealerMobleTel              string      `json:"up_dealer_moble_tel"`
-		UpDealerOrgCode               string      `json:"up_dealer_org_code"`
-		UpDealerOrgInstaller          string      `json:"up_dealer_org_installer"`
-		UpDealerOrgInstallerEmail     string      `json:"up_dealer_org_installer_email"`
-		UpDealerOrgInstallerPhone     string      `json:"up_dealer_org_installer_phone"`
-		UpDealerUserName              string      `json:"up_dealer_user_name"`
-		UpDealerUserTelNationCode     string      `json:"up_dealer_user_tel_nation_code"`
+		OrgIndexCode                  api.String  `json:"org_index_code"`
+		OrgName                       api.String  `json:"org_name"`
+		UpDealerEmail                 api.String  `json:"up_dealer_email"`
+		UpDealerMobileTel             api.String  `json:"up_dealer_moble_tel"`
+		UpDealerOrgCode               api.String  `json:"up_dealer_org_code"`
+		UpDealerOrgInstaller          api.String  `json:"up_dealer_org_installer"`
+		UpDealerOrgInstallerEmail     api.String  `json:"up_dealer_org_installer_email"`
+		UpDealerOrgInstallerPhone     api.String  `json:"up_dealer_org_installer_phone"`
+		UpDealerUserName              api.String  `json:"up_dealer_user_name"`
+		UpDealerUserTelNationCode     api.String  `json:"up_dealer_user_tel_nation_code"`
 		UpOrgID                       api.Integer `json:"up_org_id"`
-		UpOrgName                     string      `json:"up_org_name"`
-		UserName                      string      `json:"user_name"`
-		UserTelNationCode             interface{} `json:"user_tel_nation_code"`
+		UpOrgName                     api.String  `json:"up_org_name"`
+		UserName                      api.String  `json:"user_name"`
+		UserTelNationCode             api.String  `json:"user_tel_nation_code"`
 	} `json:"user_org_info"`
-	UserPassword      string      `json:"user_password"`
-	UserTelNationCode interface{} `json:"user_tel_nation_code"`
+	UserPassword      api.String  `json:"user_password"`
+	UserTelNationCode api.String  `json:"user_tel_nation_code"`
 	ValidFlag         api.Integer `json:"valid_flag"`
 	Voice             api.Integer `json:"voice"`
-	WorkTel           string      `json:"work_tel"`
+	WorkTel           api.String  `json:"work_tel"`
 }
 
 func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPsWeatherList/data.go b/iSolarCloud/AppService/getPsWeatherList/data.go
index 9c42348b6..422a4cc64 100644
--- a/iSolarCloud/AppService/getPsWeatherList/data.go
+++ b/iSolarCloud/AppService/getPsWeatherList/data.go
@@ -1,6 +1,7 @@
 package getPsWeatherList
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
 	"fmt"
 )
@@ -9,7 +10,7 @@ const Url = "/v1/powerStationService/getPsWeatherList"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/AppService/getRegionalTree/data.go b/iSolarCloud/AppService/getRegionalTree/data.go
index 8516ec6c8..3c05ad0a3 100644
--- a/iSolarCloud/AppService/getRegionalTree/data.go
+++ b/iSolarCloud/AppService/getRegionalTree/data.go
@@ -1,13 +1,13 @@
 package getRegionalTree
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/orgService/getRegionalTree"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
@@ -23,18 +23,29 @@ func (rd RequestData) Help() string {
 }
 
 
-type ResultData struct {
-	Dummy string `json:"dummy"`
+type ResultData   struct {
+	ResultList []struct {
+		Checked    api.Bool   `json:"checked"`
+		ID         api.String `json:"id"`
+		IsFirstOrg api.Bool   `json:"isFirstOrg"`
+		IsParent   api.Bool `json:"isParent"`
+		Name       api.String `json:"name"`
+		Open       api.Bool   `json:"open"`
+		OrgID      api.Integer  `json:"org_id"`
+		PID        api.Integer `json:"pId"`
+		PsID       api.Integer `json:"ps_id"`
+		ShareType  int64  `json:"share_type"`
+	} `json:"resultList"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
index e7ea5d1a8..b4d861b05 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
@@ -1,16 +1,16 @@
 package getRemoteUpgradeDeviceList
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/devService/getRemoteUpgradeDeviceList"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	DeviceType string `json:"device_type" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -23,18 +23,20 @@ func (rd RequestData) Help() string {
 }
 
 
-type ResultData struct {
-	Dummy string `json:"dummy"`
+type ResultData   struct {
+	MModuleNameList []api.String      `json:"m_module_name_list"`
+	PageList        []interface{} `json:"pageList"`
+	RowCount        api.Integer         `json:"rowCount"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getReportData/data.go b/iSolarCloud/AppService/getReportData/data.go
index 23234cd6a..90cddc50f 100644
--- a/iSolarCloud/AppService/getReportData/data.go
+++ b/iSolarCloud/AppService/getReportData/data.go
@@ -1,16 +1,17 @@
 package getReportData
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/powerStationService/getReportData"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
+	ReportType string `json:"report_type" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -22,19 +23,238 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	DataList []struct {
+		CitySubsidyCharge                    api.Float    `json:"city_subsidy_charge"`
+		CitySubsidyChargeOriginalUnit        api.String   `json:"city_subsidy_charge_original_unit"`
+		CitySubsidyChargeTran                api.Float    `json:"city_subsidy_charge_tran"`
+		CitySubsidyChargeUnit                api.String   `json:"city_subsidy_charge_unit"`
+		CountrySubsidyCharge                 api.Float    `json:"country_subsidy_charge"`
+		CountrySubsidyChargeOriginalUnit     api.String   `json:"country_subsidy_charge_original_unit"`
+		CountrySubsidyChargeTran             api.Float    `json:"country_subsidy_charge_tran"`
+		CountrySubsidyChargeUnit             api.String   `json:"country_subsidy_charge_unit"`
+		CountySubsidyCharge                  api.Float    `json:"county_subsidy_charge"`
+		CountySubsidyChargeOriginalUnit      api.String   `json:"county_subsidy_charge_original_unit"`
+		CountySubsidyChargeTran              api.Float    `json:"county_subsidy_charge_tran"`
+		CountySubsidyChargeUnit              api.String   `json:"county_subsidy_charge_unit"`
+		CuspCharge                           api.Float    `json:"cusp_charge"`
+		CuspChargeOriginalUnit               api.String   `json:"cusp_charge_original_unit"`
+		CuspChargeTran                       api.Float    `json:"cusp_charge_tran"`
+		CuspChargeUnit                       api.String   `json:"cusp_charge_unit"`
+		CuspNetPowerQuantity                 api.Float    `json:"cusp_net_power_quantity"`
+		CuspNetPowerQuantityTran             api.Float    `json:"cusp_net_power_quantity_tran"`
+		CuspNetPowerQuantityUnit             api.String   `json:"cusp_net_power_quantity_unit"`
+		CuspPowerQuantity                    api.Float    `json:"cusp_power_quantity"`
+		CuspPowerQuantityTran                api.Float    `json:"cusp_power_quantity_tran"`
+		CuspPowerQuantityUnit                api.String   `json:"cusp_power_quantity_unit"`
+		CuspUsePowerQuantity                 api.Float    `json:"cusp_use_power_quantity"`
+		CuspUsePowerQuantityTran             api.Float    `json:"cusp_use_power_quantity_tran"`
+		CuspUsePowerQuantityUnit             api.String   `json:"cusp_use_power_quantity_unit"`
+		DateID                               api.DateTime `json:"date_id"`
+		DeviceName                           api.String   `json:"device_name"`
+		FlatCharge                           api.Float    `json:"flat_charge"`
+		FlatChargeOriginalUnit               api.String   `json:"flat_charge_original_unit"`
+		FlatChargeTran                       api.Float    `json:"flat_charge_tran"`
+		FlatChargeUnit                       api.String   `json:"flat_charge_unit"`
+		FlatNetPowerQuantity                 api.Float    `json:"flat_net_power_quantity"`
+		FlatNetPowerQuantityTran             api.Float    `json:"flat_net_power_quantity_tran"`
+		FlatNetPowerQuantityUnit             api.String   `json:"flat_net_power_quantity_unit"`
+		FlatPowerQuantity                    api.Float    `json:"flat_power_quantity"`
+		FlatPowerQuantityTran                api.Float    `json:"flat_power_quantity_tran"`
+		FlatPowerQuantityUnit                api.String   `json:"flat_power_quantity_unit"`
+		FlatUsePowerQuantity                 api.Float    `json:"flat_use_power_quantity"`
+		FlatUsePowerQuantityTran             api.Float    `json:"flat_use_power_quantity_tran"`
+		FlatUsePowerQuantityUnit             api.String   `json:"flat_use_power_quantity_unit"`
+		NetPowerProfit                       api.Float    `json:"net_power_profit"`
+		NetPowerProfitOriginalUnit           api.String   `json:"net_power_profit_original_unit"`
+		NetPowerProfitTran                   api.Float    `json:"net_power_profit_tran"`
+		NetPowerProfitUnit                   api.String   `json:"net_power_profit_unit"`
+		NetPowerQuantityTotal                api.Float    `json:"net_power_quantity_total"`
+		NetPowerQuantityTotalTran            api.Float    `json:"net_power_quantity_total_tran"`
+		NetPowerQuantityTotalUnit            api.String   `json:"net_power_quantity_total_unit"`
+		PeakCharge                           api.Float    `json:"peak_charge"`
+		PeakChargeOriginalUnit               api.String   `json:"peak_charge_original_unit"`
+		PeakChargeTran                       api.Float    `json:"peak_charge_tran"`
+		PeakChargeUnit                       api.String   `json:"peak_charge_unit"`
+		PeakNetPowerQuantity                 api.Float    `json:"peak_net_power_quantity"`
+		PeakNetPowerQuantityTran             api.Float    `json:"peak_net_power_quantity_tran"`
+		PeakNetPowerQuantityUnit             api.String   `json:"peak_net_power_quantity_unit"`
+		PeakPowerQuantity                    api.Float    `json:"peak_power_quantity"`
+		PeakPowerQuantityTran                api.Float    `json:"peak_power_quantity_tran"`
+		PeakPowerQuantityUnit                api.String   `json:"peak_power_quantity_unit"`
+		PeakUsePowerQuantity                 api.Float    `json:"peak_use_power_quantity"`
+		PeakUsePowerQuantityTran             api.Float    `json:"peak_use_power_quantity_tran"`
+		PeakUsePowerQuantityUnit             api.String   `json:"peak_use_power_quantity_unit"`
+		PowerQuantityTotal                   api.Float    `json:"power_quantity_total"`
+		PowerQuantityTotalTran               api.Float    `json:"power_quantity_total_tran"`
+		PowerQuantityTotalUnit               api.String   `json:"power_quantity_total_unit"`
+		ProvinceSubsidyCharge                api.Float    `json:"province_subsidy_charge"`
+		ProvinceSubsidyChargeOriginalUnit    api.String   `json:"province_subsidy_charge_original_unit"`
+		ProvinceSubsidyChargeTran            api.Float    `json:"province_subsidy_charge_tran"`
+		ProvinceSubsidyChargeUnit            api.String   `json:"province_subsidy_charge_unit"`
+		PsID                                 api.Integer  `json:"ps_id"`
+		SubsidyProfit                        api.Float    `json:"subsidy_profit"`
+		SubsidyProfitOriginalUnit            api.String   `json:"subsidy_profit_original_unit"`
+		SubsidyProfitTran                    api.Float    `json:"subsidy_profit_tran"`
+		SubsidyProfitUnit                    api.String   `json:"subsidy_profit_unit"`
+		TimeStamp                            int64        `json:"time_stamp"`
+		TotalProfit                          api.Float    `json:"total_profit"`
+		TotalProfitOriginalUnit              api.String   `json:"total_profit_original_unit"`
+		TotalProfitTran                      api.Float    `json:"total_profit_tran"`
+		TotalProfitUnit                      api.String   `json:"total_profit_unit"`
+		UpdateTime                           api.DateTime `json:"update_time"`
+		UsePowerByDiscountProfit             api.Float    `json:"use_power_by_discount_profit"`
+		UsePowerByDiscountProfitOriginalUnit api.String   `json:"use_power_by_discount_profit_original_unit"`
+		UsePowerByDiscountProfitTran         api.Float    `json:"use_power_by_discount_profit_tran"`
+		UsePowerByDiscountProfitUnit         api.String   `json:"use_power_by_discount_profit_unit"`
+		UsePowerProfit                       api.Float    `json:"use_power_profit"`
+		UsePowerProfitOriginalUnit           api.String   `json:"use_power_profit_original_unit"`
+		UsePowerProfitTran                   api.Float    `json:"use_power_profit_tran"`
+		UsePowerProfitUnit                   api.String   `json:"use_power_profit_unit"`
+		UsePowerQuantityTotal                api.Float    `json:"use_power_quantity_total"`
+		UsePowerQuantityTotalTran            api.Float    `json:"use_power_quantity_total_tran"`
+		UsePowerQuantityTotalUnit            api.String   `json:"use_power_quantity_total_unit"`
+		UUID                                 interface{}  `json:"uuid"`
+		ValleyCharge                         api.Float    `json:"valley_charge"`
+		ValleyChargeOriginalUnit             api.String   `json:"valley_charge_original_unit"`
+		ValleyChargeTran                     api.Float    `json:"valley_charge_tran"`
+		ValleyChargeUnit                     api.String   `json:"valley_charge_unit"`
+		ValleyNetPowerQuantity               api.Float    `json:"valley_net_power_quantity"`
+		ValleyNetPowerQuantityTran           api.Float    `json:"valley_net_power_quantity_tran"`
+		ValleyNetPowerQuantityUnit           api.String   `json:"valley_net_power_quantity_unit"`
+		ValleyPowerQuantity                  api.Float    `json:"valley_power_quantity"`
+		ValleyPowerQuantityTran              api.Float    `json:"valley_power_quantity_tran"`
+		ValleyPowerQuantityUnit              api.String   `json:"valley_power_quantity_unit"`
+		ValleyUsePowerQuantity               api.Float    `json:"valley_use_power_quantity"`
+		ValleyUsePowerQuantityTran           api.Float    `json:"valley_use_power_quantity_tran"`
+		ValleyUsePowerQuantityUnit           api.String   `json:"valley_use_power_quantity_unit"`
+	} `json:"dataList"`
+	Info []struct {
+		DesignCapacity         api.Float   `json:"design_capacity"`
+		InstallerPsFaultStatus int64       `json:"installer_ps_fault_status"`
+		OwnerPsFaultStatus     int64       `json:"owner_ps_fault_status"`
+		PsFaultStatus          int64       `json:"ps_fault_status"`
+		PsID                   api.Integer `json:"ps_id"`
+		PsName                 api.String  `json:"ps_name"`
+		PsStatus               int64       `json:"ps_status"`
+		PsType                 api.Integer `json:"ps_type"`
+		PsTypeName             api.String  `json:"ps_type_name"`
+		SysScheme              int64       `json:"sys_scheme"`
+		SysSchemeName          api.String  `json:"sys_scheme_name"`
+		ValidFlag              api.Bool    `json:"valid_flag"`
+	} `json:"info"`
+	MinDateID interface{} `json:"min_date_id"`
+	Total     []struct {
+		CitySubsidyCharge                    api.Float    `json:"city_subsidy_charge"`
+		CitySubsidyChargeOriginalUnit        api.String   `json:"city_subsidy_charge_original_unit"`
+		CitySubsidyChargeTran                api.Float    `json:"city_subsidy_charge_tran"`
+		CitySubsidyChargeUnit                api.String   `json:"city_subsidy_charge_unit"`
+		CountrySubsidyCharge                 api.Float    `json:"country_subsidy_charge"`
+		CountrySubsidyChargeOriginalUnit     api.String   `json:"country_subsidy_charge_original_unit"`
+		CountrySubsidyChargeTran             api.Float    `json:"country_subsidy_charge_tran"`
+		CountrySubsidyChargeUnit             api.String   `json:"country_subsidy_charge_unit"`
+		CountySubsidyCharge                  api.Float    `json:"county_subsidy_charge"`
+		CountySubsidyChargeOriginalUnit      api.String   `json:"county_subsidy_charge_original_unit"`
+		CountySubsidyChargeTran              api.Float    `json:"county_subsidy_charge_tran"`
+		CountySubsidyChargeUnit              api.String   `json:"county_subsidy_charge_unit"`
+		CuspCharge                           api.Float    `json:"cusp_charge"`
+		CuspChargeOriginalUnit               api.String   `json:"cusp_charge_original_unit"`
+		CuspChargeTran                       api.Float    `json:"cusp_charge_tran"`
+		CuspChargeUnit                       api.String   `json:"cusp_charge_unit"`
+		CuspNetPowerQuantity                 api.Float    `json:"cusp_net_power_quantity"`
+		CuspNetPowerQuantityTran             api.Float    `json:"cusp_net_power_quantity_tran"`
+		CuspNetPowerQuantityUnit             api.String   `json:"cusp_net_power_quantity_unit"`
+		CuspPowerQuantity                    api.Float    `json:"cusp_power_quantity"`
+		CuspPowerQuantityTran                api.Float    `json:"cusp_power_quantity_tran"`
+		CuspPowerQuantityUnit                api.String   `json:"cusp_power_quantity_unit"`
+		CuspUsePowerQuantity                 api.Float    `json:"cusp_use_power_quantity"`
+		CuspUsePowerQuantityTran             api.Float    `json:"cusp_use_power_quantity_tran"`
+		CuspUsePowerQuantityUnit             api.String   `json:"cusp_use_power_quantity_unit"`
+		FlatCharge                           api.Float    `json:"flat_charge"`
+		FlatChargeOriginalUnit               api.String   `json:"flat_charge_original_unit"`
+		FlatChargeTran                       api.Float    `json:"flat_charge_tran"`
+		FlatChargeUnit                       api.String   `json:"flat_charge_unit"`
+		FlatNetPowerQuantity                 api.Float    `json:"flat_net_power_quantity"`
+		FlatNetPowerQuantityTran             api.Float    `json:"flat_net_power_quantity_tran"`
+		FlatNetPowerQuantityUnit             api.String   `json:"flat_net_power_quantity_unit"`
+		FlatPowerQuantity                    api.Float    `json:"flat_power_quantity"`
+		FlatPowerQuantityTran                api.Float    `json:"flat_power_quantity_tran"`
+		FlatPowerQuantityUnit                api.String   `json:"flat_power_quantity_unit"`
+		FlatUsePowerQuantity                 api.Float    `json:"flat_use_power_quantity"`
+		FlatUsePowerQuantityTran             api.Float    `json:"flat_use_power_quantity_tran"`
+		FlatUsePowerQuantityUnit             api.String   `json:"flat_use_power_quantity_unit"`
+		NetPowerProfit                       api.Float    `json:"net_power_profit"`
+		NetPowerProfitOriginalUnit           api.String   `json:"net_power_profit_original_unit"`
+		NetPowerProfitTran                   api.Float    `json:"net_power_profit_tran"`
+		NetPowerProfitUnit                   api.String   `json:"net_power_profit_unit"`
+		NetPowerQuantityTotal                api.Float    `json:"net_power_quantity_total"`
+		NetPowerQuantityTotalTran            api.Float    `json:"net_power_quantity_total_tran"`
+		NetPowerQuantityTotalUnit            api.String   `json:"net_power_quantity_total_unit"`
+		PeakCharge                           api.Float    `json:"peak_charge"`
+		PeakChargeOriginalUnit               api.String   `json:"peak_charge_original_unit"`
+		PeakChargeTran                       api.Float    `json:"peak_charge_tran"`
+		PeakChargeUnit                       api.String   `json:"peak_charge_unit"`
+		PeakNetPowerQuantity                 api.Float    `json:"peak_net_power_quantity"`
+		PeakNetPowerQuantityTran             api.Float    `json:"peak_net_power_quantity_tran"`
+		PeakNetPowerQuantityUnit             api.String   `json:"peak_net_power_quantity_unit"`
+		PeakPowerQuantity                    api.Float    `json:"peak_power_quantity"`
+		PeakPowerQuantityTran                api.Float    `json:"peak_power_quantity_tran"`
+		PeakPowerQuantityUnit                api.String   `json:"peak_power_quantity_unit"`
+		PeakUsePowerQuantity                 api.Float    `json:"peak_use_power_quantity"`
+		PeakUsePowerQuantityTran             api.Float    `json:"peak_use_power_quantity_tran"`
+		PeakUsePowerQuantityUnit             api.String   `json:"peak_use_power_quantity_unit"`
+		PowerQuantityTotal                   api.Float    `json:"power_quantity_total"`
+		PowerQuantityTotalTran               api.Float    `json:"power_quantity_total_tran"`
+		PowerQuantityTotalUnit               api.String   `json:"power_quantity_total_unit"`
+		ProvinceSubsidyCharge                api.Float    `json:"province_subsidy_charge"`
+		ProvinceSubsidyChargeOriginalUnit    api.String   `json:"province_subsidy_charge_original_unit"`
+		ProvinceSubsidyChargeTran            api.Float    `json:"province_subsidy_charge_tran"`
+		ProvinceSubsidyChargeUnit            api.String   `json:"province_subsidy_charge_unit"`
+		PsID                                 api.Integer  `json:"ps_id"`
+		SubsidyProfit                        api.Float    `json:"subsidy_profit"`
+		SubsidyProfitOriginalUnit            api.String   `json:"subsidy_profit_original_unit"`
+		SubsidyProfitTran                    api.Float    `json:"subsidy_profit_tran"`
+		SubsidyProfitUnit                    api.String   `json:"subsidy_profit_unit"`
+		TotalProfit                          api.Float    `json:"total_profit"`
+		TotalProfitOriginalUnit              api.String   `json:"total_profit_original_unit"`
+		TotalProfitTran                      api.Float    `json:"total_profit_tran"`
+		TotalProfitUnit                      api.String   `json:"total_profit_unit"`
+		UpdateTime                           api.DateTime `json:"update_time"`
+		UsePowerByDiscountProfit             api.Float    `json:"use_power_by_discount_profit"`
+		UsePowerByDiscountProfitOriginalUnit api.String   `json:"use_power_by_discount_profit_original_unit"`
+		UsePowerByDiscountProfitTran         api.Float    `json:"use_power_by_discount_profit_tran"`
+		UsePowerByDiscountProfitUnit         api.String   `json:"use_power_by_discount_profit_unit"`
+		UsePowerProfit                       api.Float    `json:"use_power_profit"`
+		UsePowerProfitOriginalUnit           api.String   `json:"use_power_profit_original_unit"`
+		UsePowerProfitTran                   api.Float    `json:"use_power_profit_tran"`
+		UsePowerProfitUnit                   api.String   `json:"use_power_profit_unit"`
+		UsePowerQuantityTotal                api.Float    `json:"use_power_quantity_total"`
+		UsePowerQuantityTotalTran            api.Float    `json:"use_power_quantity_total_tran"`
+		UsePowerQuantityTotalUnit            api.String   `json:"use_power_quantity_total_unit"`
+		ValleyCharge                         api.Float    `json:"valley_charge"`
+		ValleyChargeOriginalUnit             api.String   `json:"valley_charge_original_unit"`
+		ValleyChargeTran                     api.Float    `json:"valley_charge_tran"`
+		ValleyChargeUnit                     api.String   `json:"valley_charge_unit"`
+		ValleyNetPowerQuantity               api.Float    `json:"valley_net_power_quantity"`
+		ValleyNetPowerQuantityTran           api.Float    `json:"valley_net_power_quantity_tran"`
+		ValleyNetPowerQuantityUnit           api.String   `json:"valley_net_power_quantity_unit"`
+		ValleyPowerQuantity                  api.Float    `json:"valley_power_quantity"`
+		ValleyPowerQuantityTran              api.Float    `json:"valley_power_quantity_tran"`
+		ValleyPowerQuantityUnit              api.String   `json:"valley_power_quantity_unit"`
+		ValleyUsePowerQuantity               api.Float    `json:"valley_use_power_quantity"`
+		ValleyUsePowerQuantityTran           api.Float    `json:"valley_use_power_quantity_tran"`
+		ValleyUsePowerQuantityUnit           api.String   `json:"valley_use_power_quantity_unit"`
+	} `json:"total"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
index ee82763f2..3a57ed8f5 100644
--- a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
+++ b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
@@ -1,13 +1,13 @@
 package getReportEmailConfigInfo
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/reportService/getReportEmailConfigInfo"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
@@ -24,17 +24,39 @@ func (rd RequestData) Help() string {
 
 
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	ReportEmailConfigInfoList []struct {
+		Email      api.String `json:"email"`
+		ReportList []struct {
+			CreateTime                 api.DateTime `json:"create_time"`
+			CreateUserID               api.Integer  `json:"create_user_id"`
+			EmailAddTime               api.DateTime `json:"email_add_time"`
+			ID                         api.Integer  `json:"id"`
+			IsAllowEmailSend           api.Bool     `json:"is_allow_email_send"`
+			IsBank                     api.Bool     `json:"is_bank"`
+			IsCanRenewSendConfirmEmail api.Bool     `json:"is_can_renew_send_confirm_email"`
+			IsNewWeb                   api.Bool     `json:"is_new_web"`
+			OrderID                    api.Integer  `json:"order_id"`
+			ReSendConfirmEmailTime     api.DateTime `json:"re_send_confirm_email_time"`
+			ReportID                   api.Integer  `json:"report_id"`
+			ReportName                 api.String   `json:"report_name"`
+			SendEmail                  api.String   `json:"send_email"`
+			Status                     api.Bool     `json:"status"`
+			TimeDimension              api.Integer  `json:"time_dimension"`
+			Type                       api.Integer  `json:"type"`
+			UpdateTime                 api.DateTime `json:"update_time"`
+			UserID                     api.Integer  `json:"user_id"`
+		} `json:"report_list"`
+	} `json:"report_email_config_info_list"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getSerialNum/data.go b/iSolarCloud/AppService/getSerialNum/data.go
index 974a4243a..da8582184 100644
--- a/iSolarCloud/AppService/getSerialNum/data.go
+++ b/iSolarCloud/AppService/getSerialNum/data.go
@@ -7,7 +7,7 @@ import (
 )
 
 const Url = "/v1/devService/getSerialNum"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
diff --git a/iSolarCloud/AppService/getStationInfoSql/data.go b/iSolarCloud/AppService/getStationInfoSql/data.go
index 7c3564bc8..e032d204c 100644
--- a/iSolarCloud/AppService/getStationInfoSql/data.go
+++ b/iSolarCloud/AppService/getStationInfoSql/data.go
@@ -7,7 +7,7 @@ import (
 )
 
 const Url = "/v1/devService/getStationInfoSql"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
diff --git a/iSolarCloud/AppService/getSysMsg/data.go b/iSolarCloud/AppService/getSysMsg/data.go
index def2abee8..db25580c1 100644
--- a/iSolarCloud/AppService/getSysMsg/data.go
+++ b/iSolarCloud/AppService/getSysMsg/data.go
@@ -1,13 +1,13 @@
 package getSysMsg
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/otherService/getSysMsg"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
@@ -22,19 +22,67 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
-type ResultData struct {
-	Dummy string `json:"dummy"`
+type ResultData []struct {
+	AttachNames     interface{}  `json:"attach_names"`
+	AttachPath      interface{}  `json:"attach_path"`
+	BusinessID      api.Integer  `json:"business_id"`
+	ClickNum        api.Integer  `json:"click_num"`
+	CreateTime      api.DateTime `json:"create_time"`
+	EndTime         api.DateTime `json:"end_time"`
+	Ispublish       api.Bool     `json:"ispublish"`
+	MsgContents     api.String   `json:"msg_contents"`
+	MsgContentsDeDe api.String   `json:"msg_contents_de_de"`
+	MsgContentsEnUs api.String   `json:"msg_contents_en_us"`
+	MsgContentsEsEs api.String   `json:"msg_contents_es_es"`
+	MsgContentsFrFr api.String   `json:"msg_contents_fr_fr"`
+	MsgContentsIDID api.String   `json:"msg_contents_id_id"`
+	MsgContentsItIt api.String   `json:"msg_contents_it_it"`
+	MsgContentsJaJp api.String   `json:"msg_contents_ja_jp"`
+	MsgContentsKoKr api.String   `json:"msg_contents_ko_kr"`
+	MsgContentsNlNl api.String   `json:"msg_contents_nl_nl"`
+	MsgContentsPlPl api.String   `json:"msg_contents_pl_pl"`
+	MsgContentsPtBr api.String   `json:"msg_contents_pt_br"`
+	MsgContentsPtPt api.String   `json:"msg_contents_pt_pt"`
+	MsgContentsTrTr api.String   `json:"msg_contents_tr_tr"`
+	MsgContentsViVn api.String   `json:"msg_contents_vi_vn"`
+	MsgContentsZhTw api.String   `json:"msg_contents_zh_tw"`
+	MsgID           api.Integer  `json:"msg_id"`
+	MsgLevel        api.Integer  `json:"msg_level"`
+	MsgTitle        api.String   `json:"msg_title"`
+	MsgTitleDeDe    api.String   `json:"msg_title_de_de"`
+	MsgTitleEnUs    api.String   `json:"msg_title_en_us"`
+	MsgTitleEsEs    api.String   `json:"msg_title_es_es"`
+	MsgTitleFrFr    api.String   `json:"msg_title_fr_fr"`
+	MsgTitleIDID    api.String   `json:"msg_title_id_id"`
+	MsgTitleItIt    api.String   `json:"msg_title_it_it"`
+	MsgTitleJaJp    api.String   `json:"msg_title_ja_jp"`
+	MsgTitleKoKr    api.String   `json:"msg_title_ko_kr"`
+	MsgTitleNlNl    api.String   `json:"msg_title_nl_nl"`
+	MsgTitlePlPl    api.String   `json:"msg_title_pl_pl"`
+	MsgTitlePtBr    api.String   `json:"msg_title_pt_br"`
+	MsgTitlePtPt    api.String   `json:"msg_title_pt_pt"`
+	MsgTitleTrTr    api.String   `json:"msg_title_tr_tr"`
+	MsgTitleViVn    api.String   `json:"msg_title_vi_vn"`
+	MsgTitleZhTw    api.String   `json:"msg_title_zh_tw"`
+	MsgUserIds      api.String   `json:"msg_user_ids"`
+	OperateType     api.Integer  `json:"operate_type"`
+	OperateURL      api.String   `json:"operate_url"`
+	PublishTime     api.DateTime `json:"publish_time"`
+	RemindType      api.Integer  `json:"remind_type"`
+	StartTime       api.DateTime `json:"start_time"`
+	TypeID          api.Integer  `json:"type_id"`
+	UserID          api.Integer  `json:"user_id"`
+	UserName        api.String   `json:"user_name"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getTemplateList/data.go b/iSolarCloud/AppService/getTemplateList/data.go
index 6942e0088..2313c2576 100644
--- a/iSolarCloud/AppService/getTemplateList/data.go
+++ b/iSolarCloud/AppService/getTemplateList/data.go
@@ -26,8 +26,8 @@ func (rd RequestData) Help() string {
 type ResultData struct {
 	PageList []struct {
 		TemplateID   api.Integer  `json:"template_id"`
-		TemplateName string `json:"template_name"`
-		UpdateTime   string `json:"update_time"`
+		TemplateName api.String `json:"template_name"`
+		UpdateTime   api.DateTime `json:"update_time"`
 	} `json:"pageList"`
 	RowCount api.Integer `json:"rowCount"`
 }
@@ -84,24 +84,13 @@ func (e *EndPoint) GetDataTable() output.Table {
 			_ = table.AddRow(
 				p.TemplateID,
 				p.TemplateName,
-				api.NewDateTime(p.UpdateTime).PrintFull(),
+				// api.NewDateTime(p.UpdateTime).PrintFull(),
+				p.UpdateTime.String(),
 			)
 			if table.Error != nil {
 				continue
 			}
 		}
-
-		// table.InitGraph(output.GraphRequest {
-		// 	Title:        "",
-		// 	TimeColumn:   output.SetInteger(1),
-		// 	SearchColumn: output.SetInteger(2),
-		// 	NameColumn:   output.SetInteger(3),
-		// 	ValueColumn:  output.SetInteger(4),
-		// 	UnitsColumn:  output.SetInteger(5),
-		// 	SearchString: output.SetString(""),
-		// 	MinLeftAxis:  output.SetFloat(0),
-		// 	MaxLeftAxis:  output.SetFloat(0),
-		// })
 	}
 
 	return table
diff --git a/iSolarCloud/AppService/getUpTimePoint/data.go b/iSolarCloud/AppService/getUpTimePoint/data.go
index da6927fb0..76230753f 100644
--- a/iSolarCloud/AppService/getUpTimePoint/data.go
+++ b/iSolarCloud/AppService/getUpTimePoint/data.go
@@ -1,13 +1,13 @@
 package getUpTimePoint
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/devService/getUpTimePoint"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
 	// DeviceType string `json:"device_type" required:"true"`
@@ -24,17 +24,24 @@ func (rd RequestData) Help() string {
 
 
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	PointTimeRelation []struct {
+		Is24Hour  api.Bool `json:"is_24_hour"`
+		PointList []struct {
+			PointID  api.Integer `json:"point_id"`
+			TimeType api.Integer `json:"time_type"`
+		} `json:"point_list"`
+		UpTimePointID api.Integer `json:"up_time_point_id"`
+	} `json:"point_time_relation"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/getUserPsOrderList/data.go b/iSolarCloud/AppService/getUserPsOrderList/data.go
index 529391486..799f4daad 100644
--- a/iSolarCloud/AppService/getUserPsOrderList/data.go
+++ b/iSolarCloud/AppService/getUserPsOrderList/data.go
@@ -23,7 +23,7 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	CurPage    api.Integer   `json:"curPage"`
-	IsMore     interface{}   `json:"isMore"`
+	IsMore     api.Bool      `json:"isMore"`
 	PageList   []interface{} `json:"pageList"`
 	RowCount   api.Integer   `json:"rowCount"`
 	Size       api.Integer   `json:"size"`
diff --git a/iSolarCloud/AppService/listOssFiles/data.go b/iSolarCloud/AppService/listOssFiles/data.go
index fb9b3542b..c177a53c0 100644
--- a/iSolarCloud/AppService/listOssFiles/data.go
+++ b/iSolarCloud/AppService/listOssFiles/data.go
@@ -2,15 +2,14 @@ package listOssFiles
 
 import (
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/commonService/listOssFiles"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	Prefix string `json:"prefix" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -23,18 +22,18 @@ func (rd RequestData) Help() string {
 }
 
 
-type ResultData struct {
+type ResultData []struct {
 	Dummy string `json:"dummy"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/login/data.go b/iSolarCloud/AppService/login/data.go
index 4c7eeab13..15bd26d16 100644
--- a/iSolarCloud/AppService/login/data.go
+++ b/iSolarCloud/AppService/login/data.go
@@ -43,23 +43,23 @@ type ResultData struct {
 	GcjLatitude            api.Float   `json:"gcj_latitude"`
 	GcjLongitude           api.Float   `json:"gcj_longitude"`
 	ImToken                interface{} `json:"im_token"`
-	IsDST                  string      `json:"isDST"`
-	IsAfsFlag              string      `json:"is_afs_flag"`
-	IsAgreeGdpr            api.Integer `json:"is_agree_gdpr"`
-	IsAu                   api.Integer `json:"is_au"`
-	IsCanModifyUserAccount api.Integer `json:"is_can_modify_user_account"`
-	IsDisableMap           string      `json:"is_disable_map"`
-	IsGdpr                 api.Integer `json:"is_gdpr"`
-	IsHaveIm               api.Integer `json:"is_have_im"`
-	IsNewVersion           api.Integer `json:"is_new_version"`
-	IsOnline               string      `json:"is_online"`
-	IsOpenProtocol         api.Integer `json:"is_open_protocol"`
-	IsReceiveNotice        api.Integer `json:"is_receive_notice"`
-	IsSharePosition        api.Integer `json:"is_share_position"`
-	IsUploadLocation       api.Integer `json:"is_upload_location"`
-	IsUseSungrowBrand      string      `json:"is_use_sungrow_brand"`
-	IsValidMobileEmail     api.Integer `json:"is_valid_mobile_email"`
-	Isdst                  string      `json:"isdst"`
+	IsDST                  api.Bool    `json:"isDST"`
+	IsAfsFlag              api.Bool    `json:"is_afs_flag"`
+	IsAgreeGdpr            api.Bool    `json:"is_agree_gdpr"`
+	IsAu                   api.Bool    `json:"is_au"`
+	IsCanModifyUserAccount api.Bool    `json:"is_can_modify_user_account"`
+	IsDisableMap           api.Bool    `json:"is_disable_map"`
+	IsGdpr                 api.Bool    `json:"is_gdpr"`
+	IsHaveIm               api.Bool    `json:"is_have_im"`
+	IsNewVersion           api.Bool    `json:"is_new_version"`
+	IsOnline               api.Bool    `json:"is_online"`
+	IsOpenProtocol         api.Bool    `json:"is_open_protocol"`
+	IsReceiveNotice        api.Bool    `json:"is_receive_notice"`
+	IsSharePosition        api.Bool    `json:"is_share_position"`
+	IsUploadLocation       api.Bool    `json:"is_upload_location"`
+	IsUseSungrowBrand      api.Bool    `json:"is_use_sungrow_brand"`
+	IsValidMobileEmail     api.Bool    `json:"is_valid_mobile_email"`
+	Isdst                  api.Bool    `json:"isdst"`
 	Jobs                   interface{} `json:"jobs"`
 	Language               string      `json:"language"`
 	LoginFirstDate         api.DateTime      `json:"loginFirstDate"`
@@ -81,8 +81,8 @@ type ResultData struct {
 	Privileges             []struct {
 		FatherID        api.Integer `json:"father_id"`
 		IconURL         interface{} `json:"icon_url"`
-		IsOpen          interface{} `json:"is_open"`
-		IsThirdPlatform api.Integer `json:"is_third_platform"`
+		IsOpen          api.Bool    `json:"is_open"`
+		IsThirdPlatform api.Bool    `json:"is_third_platform"`
 		MenuCode        string      `json:"menu_code"`
 		MenuLevel       api.Integer `json:"menu_level"`
 		MenuName        string      `json:"menu_name"`
@@ -164,8 +164,8 @@ func (e *EndPoint) Email() string {
 func (e *EndPoint) CreateDate() string {
 	return e.Response.ResultData.Createdate
 }
-func (e *EndPoint) IsOnline() string {
-	return e.Response.ResultData.IsOnline
+func (e *EndPoint) IsOnline() bool {
+	return e.Response.ResultData.IsOnline.Value()
 }
 func (e *EndPoint) LoginLastDate() string {
 	return e.Response.ResultData.LoginLastDate.String()
diff --git a/iSolarCloud/AppService/psForcastInfo/data.go b/iSolarCloud/AppService/psForcastInfo/data.go
index c95055c6a..9879f82ab 100644
--- a/iSolarCloud/AppService/psForcastInfo/data.go
+++ b/iSolarCloud/AppService/psForcastInfo/data.go
@@ -1,16 +1,16 @@
 package psForcastInfo
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/powerStationService/psForcastInfo"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -24,17 +24,46 @@ func (rd RequestData) Help() string {
 
 
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	AreaForcastList []struct {
+		Chill             api.String   `json:"chill"`
+		City              api.String   `json:"city"`
+		Code              string       `json:"code"`
+		CodeName          api.String   `json:"code_name"`
+		DateTime          api.DateTime `json:"date_time"`
+		Direction         api.Float    `json:"direction"`
+		High              api.Float    `json:"high"`
+		Highc             api.Float    `json:"highc"`
+		Humidity          api.Float    `json:"humidity"`
+		Low               api.Float    `json:"low"`
+		Lowc              api.Float    `json:"lowc"`
+		Pressure          api.Float    `json:"pressure"`
+		PsKnowledge       api.String   `json:"ps_knowledge"`
+		Rising            string       `json:"rising"`
+		Speed             api.Float    `json:"speed"`
+		SpeedOriginal     api.Float    `json:"speed_original"`
+		SpeedOriginalUnit api.String   `json:"speed_original_unit"`
+		SpeedUnit         api.String   `json:"speed_unit"`
+		Sunrise           api.String   `json:"sunrise"`
+		Sunset            api.String   `json:"sunset"`
+		Visibility        api.Float    `json:"visibility"`
+		WeatherDesc       api.String   `json:"weather_desc"`
+		WeatherURL        api.String   `json:"weather_url"`
+	} `json:"areaForcastList"`
+	StationsCityCode []struct {
+		City   api.String  `json:"city"`
+		PsID   api.Integer `json:"ps_id"`
+		PsName api.String  `json:"ps_name"`
+	} `json:"stationsCityCode"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/queryDeviceInfo/data.go b/iSolarCloud/AppService/queryDeviceInfo/data.go
index f12368a1e..b6fbbf362 100644
--- a/iSolarCloud/AppService/queryDeviceInfo/data.go
+++ b/iSolarCloud/AppService/queryDeviceInfo/data.go
@@ -1,16 +1,17 @@
 package queryDeviceInfo
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
-const Url = "/v1/devService/queryDeviceInfoForApp"
-const Disabled = true
+const Url = "/v1/devService/queryDeviceInfo"
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	DeviceSn string `json:"device_sn,omitempty"`
+	Uuid string `json:"uuid,omitempty"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -22,19 +23,107 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	ArmVersion           interface{} `json:"arm_version"`
+	BatVersion           interface{} `json:"bat_version"`
+	BatteryVersion       interface{} `json:"battery_version"`
+	ChannelId            api.Integer `json:"chnnl_id"`
+	CommandStatus        api.Integer `json:"command_status"`
+	CommunicationDevUUID api.Integer `json:"communication_dev_uuid"`
+	CountryID            interface{} `json:"country_id"`
+	CpldVersion          interface{} `json:"cpld_version"`
+	DataFlagDetail       api.Integer `json:"data_flag_detail"`
+	DevFaultStatus       string      `json:"dev_fault_status"`
+	DevStatus            string      `json:"dev_status"`
+	DeviceModelList      []struct {
+		DeviceModel     api.String  `json:"device_model"`
+		DeviceModelCode api.String  `json:"device_model_code"`
+		ModelID         api.Integer `json:"model_id"`
+	} `json:"deviceModelList"`
+	DevicePropertyValueList []struct {
+		DeviceType     api.Integer `json:"device_type"`
+		PropertyCode   api.Integer `json:"property_code"`
+		PropertyDefVal api.String  `json:"property_def_val"`
+		PropertyName   api.String  `json:"property_name"`
+		PropertyValue  interface{} `json:"property_value"`
+		UUID           api.String  `json:"uuid"`
+	} `json:"devicePropertyValueList"`
+	DeviceArea              api.String    `json:"device_area"`
+	DeviceAreaName          api.String    `json:"device_area_name"`
+	DeviceCode              api.Integer   `json:"device_code"`
+	DeviceFactoryID         interface{}   `json:"device_factory_id"`
+	DeviceModel             api.String    `json:"device_model"`
+	DeviceModelCode         api.String    `json:"device_model_code"`
+	DeviceModelID           api.Integer   `json:"device_model_id"`
+	DeviceName              api.String    `json:"device_name"`
+	DeviceProSn             api.String    `json:"device_pro_sn"`
+	DeviceStatus            int64         `json:"device_status"`
+	DeviceType              int64         `json:"device_type"`
+	FactoryName             api.String    `json:"factory_name"`
+	GridTypeID              interface{}   `json:"grid_type_id"`
+	InstallerDevFaultStatus interface{}   `json:"installer_dev_fault_status"`
+	InverterModelType       int64         `json:"inverter_model_type"`
+	IsCountryCheck          api.Bool      `json:"is_country_check"`
+	IsEnable                api.Bool      `json:"is_enable"`
+	IsG2point5Module        api.Bool      `json:"is_g2point5_module"`
+	IsHaveversion           api.Bool      `json:"is_haveversion"`
+	IsInit                  api.Bool      `json:"is_init"`
+	IsNeedModbusAddress     api.Bool      `json:"is_need_modbus_address"`
+	IsReadSet               api.Bool      `json:"is_read_set"`
+	IsReplacing             api.Bool      `json:"is_replacing"`
+	IsReset                 api.Bool      `json:"is_reset"`
+	IsSupportParamSet       api.Bool      `json:"is_support_param_set"`
+	IsSupportRemoteUpgrade  api.Bool      `json:"is_support_remote_upgrade"`
+	IsThirdParty            api.Bool      `json:"is_third_party"`
+	Latitude                api.Float     `json:"latitude"`
+	LcdVersion              interface{}   `json:"lcd_version"`
+	LoggerCode              api.Integer   `json:"logger_code"`
+	Longitude               api.Float     `json:"longitude"`
+	MVersion                api.String    `json:"m_version"`
+	MachineVersion          interface{}   `json:"machine_version"`
+	MasterNodeVersion       interface{}   `json:"master_node_version"`
+	McuVersion              interface{}   `json:"mcu_version"`
+	MdspVersion             interface{}   `json:"mdsp_version"`
+	ModelTechList           []interface{} `json:"modelTechList"`
+	NodeTimestamps          interface{}   `json:"node_timestamps"`
+	OwnerDevFaultStatus     interface{}   `json:"owner_dev_fault_status"`
+	P2                      interface{}   `json:"p2"`
+	P24                     interface{}   `json:"p24"`
+	PsID                    api.Integer   `json:"ps_id"`
+	PsKey                   api.String    `json:"ps_key"`
+	PsName                  api.String    `json:"ps_name"`
+	PsShortName             api.String    `json:"ps_short_name"`
+	PvdVersion              interface{}   `json:"pvd_version"`
+	SdspVersion             interface{}   `json:"sdsp_version"`
+	Sn                      api.String    `json:"sn"`
+	SubTypeList             []interface{} `json:"subTypeList"`
+	TempVersion             interface{}   `json:"temp_version"`
+	TypeName                api.String    `json:"type_name"`
+	UpUUID                  api.Integer   `json:"up_uuid"`
+	UpgradeVersion          interface{}   `json:"upgrade_version"`
+	UUID                    api.Integer   `json:"uuid"`
+	Version1                interface{}   `json:"version1"`
+	Version10               interface{}   `json:"version10"`
+	Version11               interface{}   `json:"version11"`
+	Version12               interface{}   `json:"version12"`
+	Version2                interface{}   `json:"version2"`
+	Version3                interface{}   `json:"version3"`
+	Version4                interface{}   `json:"version4"`
+	Version5                interface{}   `json:"version5"`
+	Version6                interface{}   `json:"version6"`
+	Version7                interface{}   `json:"version7"`
+	Version8                interface{}   `json:"version8"`
+	Version9                interface{}   `json:"version9"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
index b13b476ab..80af6f95c 100644
--- a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
+++ b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
@@ -1,16 +1,17 @@
 package queryDeviceInfoForApp
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"errors"
 	"fmt"
 )
 
 const Url = "/v1/devService/queryDeviceInfoForApp"
-const Disabled = true
+const Disabled = false
 
 type RequestData struct {
-	// DeviceType string `json:"device_type" required:"true"`
+	DeviceSn string `json:"device_sn,omitempty"`
+	Uuid string `json:"uuid,omitempty"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -22,19 +23,107 @@ func (rd RequestData) Help() string {
 	return ret
 }
 
-
 type ResultData struct {
-	Dummy string `json:"dummy"`
+	ArmVersion           interface{} `json:"arm_version"`
+	BatVersion           interface{} `json:"bat_version"`
+	BatteryVersion       interface{} `json:"battery_version"`
+	ChannelId            api.Integer `json:"chnnl_id"`
+	CommandStatus        api.Integer `json:"command_status"`
+	CommunicationDevUUID api.Integer `json:"communication_dev_uuid"`
+	CountryID            interface{} `json:"country_id"`
+	CpldVersion          interface{} `json:"cpld_version"`
+	DataFlagDetail       api.Integer `json:"data_flag_detail"`
+	DevFaultStatus       string      `json:"dev_fault_status"`
+	DevStatus            string      `json:"dev_status"`
+	DeviceModelList      []struct {
+		DeviceModel     api.String  `json:"device_model"`
+		DeviceModelCode api.String  `json:"device_model_code"`
+		ModelID         api.Integer `json:"model_id"`
+	} `json:"deviceModelList"`
+	DevicePropertyValueList []struct {
+		DeviceType     api.Integer `json:"device_type"`
+		PropertyCode   api.Integer `json:"property_code"`
+		PropertyDefVal api.String  `json:"property_def_val"`
+		PropertyName   api.String  `json:"property_name"`
+		PropertyValue  interface{} `json:"property_value"`
+		UUID           api.String  `json:"uuid"`
+	} `json:"devicePropertyValueList"`
+	DeviceArea              api.String    `json:"device_area"`
+	DeviceAreaName          api.String    `json:"device_area_name"`
+	DeviceCode              api.Integer   `json:"device_code"`
+	DeviceFactoryID         interface{}   `json:"device_factory_id"`
+	DeviceModel             api.String    `json:"device_model"`
+	DeviceModelCode         api.String    `json:"device_model_code"`
+	DeviceModelID           api.Integer   `json:"device_model_id"`
+	DeviceName              api.String    `json:"device_name"`
+	DeviceProSn             api.String    `json:"device_pro_sn"`
+	DeviceStatus            int64         `json:"device_status"`
+	DeviceType              int64         `json:"device_type"`
+	FactoryName             api.String    `json:"factory_name"`
+	GridTypeID              interface{}   `json:"grid_type_id"`
+	InstallerDevFaultStatus interface{}   `json:"installer_dev_fault_status"`
+	InverterModelType       int64         `json:"inverter_model_type"`
+	IsCountryCheck          api.Bool      `json:"is_country_check"`
+	IsEnable                api.Bool      `json:"is_enable"`
+	IsG2point5Module        api.Bool      `json:"is_g2point5_module"`
+	IsHaveversion           api.Bool      `json:"is_haveversion"`
+	IsInit                  api.Bool      `json:"is_init"`
+	IsNeedModbusAddress     api.Bool      `json:"is_need_modbus_address"`
+	IsReadSet               api.Bool      `json:"is_read_set"`
+	IsReplacing             api.Bool      `json:"is_replacing"`
+	IsReset                 api.Bool      `json:"is_reset"`
+	IsSupportParamSet       api.Bool      `json:"is_support_param_set"`
+	IsSupportRemoteUpgrade  api.Bool      `json:"is_support_remote_upgrade"`
+	IsThirdParty            api.Bool      `json:"is_third_party"`
+	Latitude                api.Float     `json:"latitude"`
+	LcdVersion              interface{}   `json:"lcd_version"`
+	LoggerCode              api.Integer   `json:"logger_code"`
+	Longitude               api.Float     `json:"longitude"`
+	MVersion                api.String    `json:"m_version"`
+	MachineVersion          interface{}   `json:"machine_version"`
+	MasterNodeVersion       interface{}   `json:"master_node_version"`
+	McuVersion              interface{}   `json:"mcu_version"`
+	MdspVersion             interface{}   `json:"mdsp_version"`
+	ModelTechList           []interface{} `json:"modelTechList"`
+	NodeTimestamps          interface{}   `json:"node_timestamps"`
+	OwnerDevFaultStatus     interface{}   `json:"owner_dev_fault_status"`
+	P2                      interface{}   `json:"p2"`
+	P24                     interface{}   `json:"p24"`
+	PsID                    api.Integer   `json:"ps_id"`
+	PsKey                   api.String    `json:"ps_key"`
+	PsName                  api.String    `json:"ps_name"`
+	PsShortName             api.String    `json:"ps_short_name"`
+	PvdVersion              interface{}   `json:"pvd_version"`
+	SdspVersion             interface{}   `json:"sdsp_version"`
+	Sn                      api.String    `json:"sn"`
+	SubTypeList             []interface{} `json:"subTypeList"`
+	TempVersion             interface{}   `json:"temp_version"`
+	TypeName                api.String    `json:"type_name"`
+	UpUUID                  api.Integer   `json:"up_uuid"`
+	UpgradeVersion          interface{}   `json:"upgrade_version"`
+	UUID                    api.Integer   `json:"uuid"`
+	Version1                interface{}   `json:"version1"`
+	Version10               interface{}   `json:"version10"`
+	Version11               interface{}   `json:"version11"`
+	Version12               interface{}   `json:"version12"`
+	Version2                interface{}   `json:"version2"`
+	Version3                interface{}   `json:"version3"`
+	Version4                interface{}   `json:"version4"`
+	Version5                interface{}   `json:"version5"`
+	Version6                interface{}   `json:"version6"`
+	Version7                interface{}   `json:"version7"`
+	Version8                interface{}   `json:"version8"`
+	Version9                interface{}   `json:"version9"`
 }
 
 func (e *ResultData) IsValid() error {
 	var err error
-	switch {
-	case e.Dummy == "":
-		break
-	default:
-		err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
-	}
+	// switch {
+	// case e.Dummy == "":
+	// 	break
+	// default:
+	// 	err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
+	// }
 	return err
 }
 
diff --git a/iSolarCloud/AppService/queryDeviceList/data.go b/iSolarCloud/AppService/queryDeviceList/data.go
index e2f46d3d4..4cc106b05 100644
--- a/iSolarCloud/AppService/queryDeviceList/data.go
+++ b/iSolarCloud/AppService/queryDeviceList/data.go
@@ -127,7 +127,7 @@ type ResultData struct {
 			TimeZone string   `json:"time_zone"`
 		} `json:"psTimezoneInfo"`
 		PsID                    api.Integer `json:"ps_id" PointId:"ps_id" PointType:""`
-		PsKey                   string      `json:"ps_key" PointId:"ps_key" PointType:""`
+		PsKey                   api.PsKey   `json:"ps_key" PointId:"ps_key" PointType:""`
 		RelState                api.Integer `json:"rel_state" PointId:"rel_state" PointType:""`
 		Sn                      string      `json:"sn" PointId:"sn" PointType:""`
 		StringAmount            api.Integer `json:"string_amount" PointId:"string_amount" PointType:""`
@@ -341,14 +341,14 @@ func (e *EndPoint) GetData() api.DataMap {
 
 		for _, d := range e.Response.ResultData.PageList {
 			name := fmt.Sprintf("queryDeviceList.%s", d.PsKey)
-			entries.StructToPoints(d, name, d.PsKey, time.Time{})
+			entries.StructToPoints(d, name, d.PsKey.Value(), time.Time{})
 
 			for _, p := range d.PointData {
 				pid := api.SetPointInt(p.PointID.Value())
 				uv := api.SetUnitValueFloat(p.Value.Value(), p.Unit)
 				// name2 := fmt.Sprintf("%s.PointData.%s", name, pid)
 				name2 := fmt.Sprintf("%s.PointData", name)
-				entries.AddUnitValue(name2, d.PsKey, pid, p.PointName, api.NewDateTime(p.TimeStamp), uv)
+				entries.AddUnitValue(name2, d.PsKey.Value(), pid, p.PointName, api.NewDateTime(p.TimeStamp), uv)
 
 				// Handle virtual results.
 				// switch pid {
diff --git a/iSolarCloud/AppService/queryDeviceListForApp/data.go b/iSolarCloud/AppService/queryDeviceListForApp/data.go
index 396c800ea..9158fa775 100644
--- a/iSolarCloud/AppService/queryDeviceListForApp/data.go
+++ b/iSolarCloud/AppService/queryDeviceListForApp/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/devService/queryDeviceListForApp"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -24,50 +24,50 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	PageList []struct {
-		AttrID                  api.Integer `json:"attr_id"`
-		ChnnlID                 api.Integer `json:"chnnl_id"`
-		CommandStatus           api.Integer `json:"command_status"`
-		ConnectState            api.Integer `json:"connect_state"`
-		DataFlag                api.Integer `json:"data_flag"`
-		DataFlagDetail          api.Integer `json:"data_flag_detail"`
-		DevFaultStatus          string      `json:"dev_fault_status"`
-		DevStatus               string      `json:"dev_status"`
-		DeviceArea              string      `json:"device_area"`
-		DeviceCode              api.Integer `json:"device_code"`
-		DeviceFactoryDate       interface{} `json:"device_factory_date"`
-		DeviceID                api.Integer `json:"device_id"`
-		DeviceModel             string      `json:"device_model"`
-		DeviceModelCode         string      `json:"device_model_code"`
-		DeviceModelID           api.Integer `json:"device_model_id"`
-		DeviceName              string      `json:"device_name"`
-		DeviceProSn             string      `json:"device_pro_sn"`
-		DeviceState             string      `json:"device_state"`
-		DeviceSubType           interface{} `json:"device_sub_type"`
-		DeviceSubTypeName       interface{} `json:"device_sub_type_name"`
-		DeviceType              api.Integer `json:"device_type"`
-		FactoryName             string      `json:"factory_name"`
-		InstallerDevFaultStatus string      `json:"installer_dev_fault_status"`
-		InverterModelType       api.Integer `json:"inverter_model_type"`
-		IsCountryCheck          api.Integer `json:"is_country_check"`
-		IsHasFunctionEnum       api.Integer `json:"is_has_function_enum"`
-		IsHasTheAbility         api.Integer `json:"is_has_the_ability"`
-		IsInit                  api.Integer `json:"is_init"`
-		IsReadSet               api.Integer `json:"is_read_set"`
-		IsReplacing             api.Integer `json:"is_replacing"`
-		IsReset                 api.Integer `json:"is_reset"`
-		IsSecond                api.Integer `json:"is_second"`
-		IsThirdParty            api.Integer `json:"is_third_party"`
-		ModuleUUID              api.Integer `json:"module_uuid"`
-		OwnerDevFaultStatus     string      `json:"owner_dev_fault_status"`
-		P24                     interface{} `json:"p24"`
-		Posx                    interface{} `json:"posx"`
-		Posy                    interface{} `json:"posy"`
-		PsID                    api.Integer `json:"ps_id"`
-		PsKey                   string      `json:"ps_key"`
-		RelState                api.Integer `json:"rel_state"`
-		Sn                      string      `json:"sn"`
-		TypeName                string      `json:"type_name"`
-		UUID                    api.Integer `json:"uuid"`
+		AttrID                  api.Integer  `json:"attr_id"`
+		ChannelId               api.Integer  `json:"chnnl_id"`
+		CommandStatus           api.Integer  `json:"command_status"`
+		ConnectState            api.Integer  `json:"connect_state"`
+		DataFlag                api.Integer  `json:"data_flag"`
+		DataFlagDetail          api.Integer  `json:"data_flag_detail"`
+		DevFaultStatus          string       `json:"dev_fault_status"`
+		DevStatus               string       `json:"dev_status"`
+		DeviceArea              api.String   `json:"device_area"`
+		DeviceCode              api.Integer  `json:"device_code"`
+		DeviceFactoryDate       api.DateTime `json:"device_factory_date"`
+		DeviceID                api.Integer  `json:"device_id"`
+		DeviceModel             api.String   `json:"device_model"`
+		DeviceModelCode         api.String   `json:"device_model_code"`
+		DeviceModelID           api.Integer  `json:"device_model_id"`
+		DeviceName              api.String   `json:"device_name"`
+		DeviceProSn             api.String   `json:"device_pro_sn"`
+		DeviceState             string       `json:"device_state"`
+		DeviceSubType           interface{}  `json:"device_sub_type"`
+		DeviceSubTypeName       interface{}  `json:"device_sub_type_name"`
+		DeviceType              api.Integer  `json:"device_type"`
+		FactoryName             api.String   `json:"factory_name"`
+		InstallerDevFaultStatus string       `json:"installer_dev_fault_status"`
+		InverterModelType       api.Integer  `json:"inverter_model_type"`
+		IsCountryCheck          api.Bool     `json:"is_country_check"`
+		IsHasFunctionEnum       api.Bool     `json:"is_has_function_enum"`
+		IsHasTheAbility         api.Bool     `json:"is_has_the_ability"`
+		IsInit                  api.Bool     `json:"is_init"`
+		IsReadSet               api.Bool     `json:"is_read_set"`
+		IsReplacing             api.Bool     `json:"is_replacing"`
+		IsReset                 api.Bool     `json:"is_reset"`
+		IsSecond                api.Bool     `json:"is_second"`
+		IsThirdParty            api.Bool     `json:"is_third_party"`
+		ModuleUUID              api.Integer  `json:"module_uuid"`
+		OwnerDevFaultStatus     string       `json:"owner_dev_fault_status"`
+		P24                     interface{}  `json:"p24"`
+		Posx                    interface{}  `json:"posx"`
+		Posy                    interface{}  `json:"posy"`
+		PsID                    api.Integer  `json:"ps_id"`
+		PsKey                   api.PsKey    `json:"ps_key"`
+		RelState                api.Integer  `json:"rel_state"`
+		Sn                      api.String   `json:"sn"`
+		TypeName                api.String   `json:"type_name"`
+		UUID                    api.Integer  `json:"uuid"`
 	} `json:"pageList"`
 	RowCount api.Integer `json:"rowCount"`
 }
diff --git a/iSolarCloud/AppService/queryMutiPointDataList/data.go b/iSolarCloud/AppService/queryMutiPointDataList/data.go
index e0e5420de..55f1c6c70 100644
--- a/iSolarCloud/AppService/queryMutiPointDataList/data.go
+++ b/iSolarCloud/AppService/queryMutiPointDataList/data.go
@@ -15,7 +15,7 @@ const Disabled = false
 
 type RequestData struct {
 	PsID           api.Integer  `json:"ps_id" required:"true"`
-	PsKey          string `json:"ps_key" required:"true"`
+	PsKey          api.PsKey `json:"ps_key" required:"true"`
 	Points         string `json:"points" required:"true"`
 	MinuteInterval string `json:"minute_interval" required:"true"`
 	StartTimeStamp string `json:"start_time_stamp" required:"true"`
diff --git a/iSolarCloud/AppService/queryPowerStationInfo/data.go b/iSolarCloud/AppService/queryPowerStationInfo/data.go
index 954a3c0e0..b88cb1a4f 100644
--- a/iSolarCloud/AppService/queryPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/queryPowerStationInfo/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/queryPowerStationInfo"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id"`
+	PsId api.Integer `json:"ps_id"`
 	Sn   string `json:"sn"`
 }
 
@@ -59,15 +59,15 @@ type ResultData   struct {
 	InverterCount         api.Integer   `json:"inverter_count"`
 	InvestmentType        api.Integer   `json:"investment_type"`
 	InvestmentTypeDesc    string        `json:"investment_type_desc"`
-	IsAgreeGdpr           api.Integer   `json:"is_agree_gdpr"`
-	IsGdpr                api.Integer   `json:"is_gdpr"`
-	IsNewVersion          api.Integer   `json:"is_new_version"`
-	IsOpenProtocol        api.Integer   `json:"is_open_protocol"`
-	IsPsCreateUser        string        `json:"is_ps_create_user"`
-	IsPsOwner             string        `json:"is_ps_owner"`
-	IsReceiveNotice       api.Integer   `json:"is_receive_notice"`
-	IsSharePosition       api.Integer   `json:"is_share_position"`
-	IsValidMobileEmail    api.Integer   `json:"is_valid_mobile_email"`
+	IsAgreeGdpr           api.Bool      `json:"is_agree_gdpr"`
+	IsGdpr                api.Bool      `json:"is_gdpr"`
+	IsNewVersion          api.Bool      `json:"is_new_version"`
+	IsOpenProtocol        api.Bool      `json:"is_open_protocol"`
+	IsPsCreateUser        api.Bool      `json:"is_ps_create_user"`
+	IsPsOwner             api.Bool      `json:"is_ps_owner"`
+	IsReceiveNotice       api.Bool      `json:"is_receive_notice"`
+	IsSharePosition       api.Bool      `json:"is_share_position"`
+	IsValidMobileEmail    api.Bool      `json:"is_valid_mobile_email"`
 	Latitude              api.Float     `json:"latitude"`
 	Longitude             api.Float     `json:"longitude"`
 	MapLatitude           api.Float     `json:"map_latitude"`
@@ -97,7 +97,7 @@ type ResultData   struct {
 	PsHolder         string `json:"ps_holder"`
 	PsID             api.Integer  `json:"ps_id"`
 	PsInstalledPower api.Float `json:"ps_installed_power"`
-	PsKey            string `json:"ps_key"`
+	PsKey            api.PsKey `json:"ps_key"`
 	PsLocation       string `json:"ps_location"`
 	PsName           string `json:"ps_name"`
 	PsOrgInfo        []struct {
@@ -134,7 +134,7 @@ type ResultData   struct {
 		CommunicateDeviceType     api.Integer  `json:"communicate_device_type"`
 		CommunicateDeviceTypeName string `json:"communicate_device_type_name"`
 		ID                        api.Integer  `json:"id"`
-		IsEnable                  api.Integer  `json:"is_enable"`
+		IsEnable                  api.Bool     `json:"is_enable"`
 		Sn                        string `json:"sn"`
 	} `json:"sn_detail_list"`
 	SummerTimeState    api.Integer `json:"summer_time_state"`
diff --git a/iSolarCloud/AppService/queryPsProfit/data.go b/iSolarCloud/AppService/queryPsProfit/data.go
index 1f562b910..e81cfa167 100644
--- a/iSolarCloud/AppService/queryPsProfit/data.go
+++ b/iSolarCloud/AppService/queryPsProfit/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/queryPsProfit"
 const Disabled = false
 
 type RequestData struct {
-	PsId     string `json:"ps_id" required:"true"`
+	PsId     api.Integer `json:"ps_id" required:"true"`
 	DateID   string `json:"date_id" required:"true"`
 	DateType string `json:"date_type" required:"true"`
 }
diff --git a/iSolarCloud/AppService/queryUnitList/data.go b/iSolarCloud/AppService/queryUnitList/data.go
index 1799db017..e470f10d9 100644
--- a/iSolarCloud/AppService/queryUnitList/data.go
+++ b/iSolarCloud/AppService/queryUnitList/data.go
@@ -23,10 +23,10 @@ func (rd RequestData) Help() string {
 }
 
 type ResultData []struct {
-	IsBasicUnit  api.Integer  `json:"is_basic_unit"`
-	TargetUnit   string `json:"target_unit"`
+	IsBasicUnit  api.Bool     `json:"is_basic_unit"`
+	TargetUnit   string       `json:"target_unit"`
 	UnitConverID api.Integer  `json:"unit_conver_id"`
-	UnitName     string `json:"unit_name"`
+	UnitName     string       `json:"unit_name"`
 	UnitType     api.Integer  `json:"unit_type"`
 }
 
diff --git a/iSolarCloud/AppService/reportList/data.go b/iSolarCloud/AppService/reportList/data.go
index f491324d1..ebabfa88b 100644
--- a/iSolarCloud/AppService/reportList/data.go
+++ b/iSolarCloud/AppService/reportList/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/reportList"
 const Disabled = false
 
 type RequestData struct {
-	PsId       string `json:"ps_id" required:"true"`
+	PsId       api.Integer `json:"ps_id" required:"true"`
 	ReportType string `json:"report_type" required:"true"`
 }
 
diff --git a/iSolarCloud/WebAppService/getDeviceUuid/data.go b/iSolarCloud/WebAppService/getDeviceUuid/data.go
index 83756bda3..5fa007d1d 100644
--- a/iSolarCloud/WebAppService/getDeviceUuid/data.go
+++ b/iSolarCloud/WebAppService/getDeviceUuid/data.go
@@ -1,6 +1,7 @@
 package getDeviceUuid
 
 import (
+	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
 	"fmt"
 )
@@ -9,7 +10,7 @@ const Url = "/v1/devService/getDeviceUuid"
 const Disabled = false
 
 type RequestData struct {
-	PsKey string `json:"ps_key" required:"true"`
+	PsKey api.PsKey `json:"ps_key" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
diff --git a/iSolarCloud/WebAppService/showPSView/data.go b/iSolarCloud/WebAppService/showPSView/data.go
index 62a5d94cf..a3d78cbb3 100644
--- a/iSolarCloud/WebAppService/showPSView/data.go
+++ b/iSolarCloud/WebAppService/showPSView/data.go
@@ -10,7 +10,7 @@ const Url = "/v1/powerStationService/showPSView"
 const Disabled = false
 
 type RequestData struct {
-	PsId string `json:"ps_id" required:"true"`
+	PsId api.Integer `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -25,7 +25,7 @@ func (rd RequestData) Help() string {
 type ResultData struct {
 	BatteryPlateCom       string        `json:"batteryPlateCom"`
 	EnvironmentCom        string        `json:"environmentCom"`
-	IsPlatformDefaultUnit string        `json:"is_platform_default_unit"`
+	IsPlatformDefaultUnit api.Bool      `json:"is_platform_default_unit"`
 	Normalization         string        `json:"normalization"`
 	Todayvalue            string        `json:"todayvalue"`
 	Todayweather          string        `json:"todayweather"`
diff --git a/iSolarCloud/api/datetime.go b/iSolarCloud/api/datetime.go
index 343a23da7..0886a4d89 100644
--- a/iSolarCloud/api/datetime.go
+++ b/iSolarCloud/api/datetime.go
@@ -10,6 +10,8 @@ import (
 var inputLayout = []string{
 	DtLayout,
 	"2006/01/02 15:04:05",
+	"2006-01-02",
+	"2006/01/02",
 	DtLayoutSecond,
 	DtLayoutMinute,
 	DtLayoutHour,
@@ -102,13 +104,6 @@ func (dt *DateTime) SetString(value string) DateTime {
 			break
 		}
 
-		// var err error
-		// // 2022-10-01 13:29:11
-		// dt.Time, err = time.Parse(defaultFormat, dt.string)
-		// if err == nil {
-		// 	break
-		// }
-
 		dt.DateType = dt.getDateType()
 		for _, f := range inputLayout {
 			dt.Time, dt.Error = time.Parse(f, value)
diff --git a/iSolarCloud/api/types.go b/iSolarCloud/api/types.go
index a097d2f33..445458013 100644
--- a/iSolarCloud/api/types.go
+++ b/iSolarCloud/api/types.go
@@ -643,6 +643,144 @@ func SetBoolValue(value bool) Bool {
 }
 
 
+type String struct {
+	string `json:"string,omitempty"`
+}
+
+// UnmarshalJSON - Convert JSON to value
+func (t *String) UnmarshalJSON(data []byte) error {
+	var err error
+
+	for range Only.Once {
+		if len(data) == 0 {
+			break
+		}
+
+		// Store result from string
+		err = json.Unmarshal(data, &t.string)
+		if err == nil {
+			t.SetString(t.string)
+			break
+		}
+	}
+
+	return err
+}
+
+// MarshalJSON - Convert value to JSON
+func (t String) MarshalJSON() ([]byte, error) {
+	var data []byte
+	var err error
+
+	for range Only.Once {
+		data, err = json.Marshal(t.string)
+		if err != nil {
+			break
+		}
+	}
+
+	return data, err
+}
+
+func (t String) Value() string {
+	return t.string
+}
+
+func (t String) String() string {
+	return t.string
+}
+
+func (t *String) SetString(value string) String {
+	for range Only.Once {
+		t.string = value
+	}
+
+	return *t
+}
+
+func (t *String) SetValue(value string) String {
+	for range Only.Once {
+		t.string = value
+	}
+
+	return *t
+}
+
+func SetStringValue(value string) String {
+	var t String
+	return t.SetValue(value)
+}
+
+
+type PsKey struct {
+	string `json:"string,omitempty"`
+}
+
+// UnmarshalJSON - Convert JSON to value
+func (t *PsKey) UnmarshalJSON(data []byte) error {
+	var err error
+
+	for range Only.Once {
+		if len(data) == 0 {
+			break
+		}
+
+		// Store result from string
+		err = json.Unmarshal(data, &t.string)
+		if err == nil {
+			t.SetPsKey(t.string)
+			break
+		}
+	}
+
+	return err
+}
+
+// MarshalJSON - Convert value to JSON
+func (t PsKey) MarshalJSON() ([]byte, error) {
+	var data []byte
+	var err error
+
+	for range Only.Once {
+		data, err = json.Marshal(t.string)
+		if err != nil {
+			break
+		}
+	}
+
+	return data, err
+}
+
+func (t PsKey) Value() string {
+	return t.string
+}
+
+func (t PsKey) PsKey() string {
+	return t.string
+}
+
+func (t *PsKey) SetPsKey(value string) PsKey {
+	for range Only.Once {
+		t.string = value
+	}
+
+	return *t
+}
+
+func (t *PsKey) SetValue(value string) PsKey {
+	for range Only.Once {
+		t.string = value
+	}
+
+	return *t
+}
+
+func SetPsKeyValue(value string) PsKey {
+	var t PsKey
+	return t.SetValue(value)
+}
+
+
 // func JsonToUnitValue(j string) UnitValue {
 // 	var ret UnitValue
 //
diff --git a/iSolarCloud/highlevel.go b/iSolarCloud/highlevel.go
index e1be6dbeb..d7d678499 100644
--- a/iSolarCloud/highlevel.go
+++ b/iSolarCloud/highlevel.go
@@ -90,10 +90,10 @@ func (sg *SunGrow) GetTemplateData(template string, date string, filter string)
 
 			ep := sg.GetByStruct(
 				"AppService.queryMutiPointDataList",
-				queryMutiPointDataList.RequestData{
+				queryMutiPointDataList.RequestData {
 					// PsID:           api.SetIntegerValue(psId),
 					PsID:           psId,
-					PsKey:          pointNames.PrintKeys(),
+					PsKey:          api.SetPsKeyValue(pointNames.PrintKeys()),
 					Points:         pointNames.PrintPoints(),
 					MinuteInterval: "5",
 					StartTimeStamp: when.GetDayStartTimestamp(),
@@ -578,7 +578,7 @@ func (sg *SunGrow) GetPointData(date string, pointNames api.TemplatePoints, psId
 				"AppService.queryMutiPointDataList",
 				queryMutiPointDataList.RequestData{
 					PsID:           psId,
-					PsKey:          pointNames.PrintKeys(),
+					PsKey:          api.SetPsKeyValue(pointNames.PrintKeys()),
 					Points:         pointNames.PrintPoints(),
 					MinuteInterval: "5",
 					StartTimeStamp: when.GetDayStartTimestamp(),
diff --git a/iSolarCloud/struct.go b/iSolarCloud/struct.go
index b49d593d9..932661be9 100644
--- a/iSolarCloud/struct.go
+++ b/iSolarCloud/struct.go
@@ -102,33 +102,29 @@ func (sg *SunGrow) GetByJson(endpoint string, request string) api.EndPoint {
 	var ret api.EndPoint
 	for range Only.Once {
 		ret = sg.GetEndpoint(endpoint)
+		sg.Error = ret.GetError()
 		if sg.Error != nil {
 			break
 		}
-		if ret.IsError() {
-			sg.Error = ret.GetError()
-			break
-		}
 
 		if request != "" {
 			ret = ret.SetRequestByJson(output.Json(request))
-			if ret.IsError() {
+			sg.Error = ret.GetError()
+			if sg.Error != nil {
 				fmt.Println(ret.Help())
-				sg.Error = ret.GetError()
 				break
 			}
 		}
 
 		ret = ret.Call()
-		if !ret.IsError() {
-			break
-		}
 		sg.Error = ret.GetError()
-		if strings.Contains(sg.Error.Error(), "er_token_login_invalid") {
-			_ = sg.ApiRoot.WebCacheRemove(sg.Auth)
-			_ = sg.Auth.RemoveToken()
-			// _ = sg.Auth.ApiRemoveDataFile()
-			break
+		if sg.Error != nil {
+			if strings.Contains(sg.Error.Error(), "er_token_login_invalid") {
+				_ = sg.ApiRoot.WebCacheRemove(sg.Auth)
+				_ = sg.Auth.RemoveToken()
+				// _ = sg.Auth.ApiRemoveDataFile()
+				break
+			}
 		}
 
 		switch {