修改首航采集

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/SoFarConstant.java

@@ -11,14 +11,10 @@ public class SoFarConstant {
 		{
 			put("1", "在线");
 			put("0", "离线");
-            put("2","报警" );
+			put("2", "报警");
 		}
 	};
 
-
-
-
-
 	public static String baseurl = "https://openapi.sofarsolarmonitor.com";
 	public static String appId = "447430219192733696";
 	public static String appSecret = "5881ee8c062817016a2b34425c45937d";
@@ -33,10 +29,11 @@ public class SoFarConstant {
 	public static String currentData = "/device/v1.0/currentData";
 	public static String nbqlist = "/station/v1.0/device?language=zh";
 	public static String historical = "/device/v1.0/historical";
+	public static String stationhisUrl = "/station/v1.0/plantHistory";
 
 	public static String alert = "/station/v1.0/alert";
-    public static String equipComm   ="/device/v1.0/equipComm";
-    public static String alertDetail= "device/v1.0/alertDetail";
+	public static String equipComm = "/device/v1.0/equipComm";
+	public static String alertDetail = "/device/v1.0/alertDetail";
 
 	public static String stationListStatusUrl = "/api/OpenApi/QueryPowerStationMonitor";
 	public static String stationDetailUrl = "/api/OpenApi/GetPowerStationMonitorDetail";
@@ -45,12 +42,12 @@ public class SoFarConstant {
 	public static String inverterListUrl = "/v1/api/inverterList";
 	public static String inverterDetailUrl = "/v1/api/inverterDetail";
 	public static String alarmListUrl = "/v1/api/alarmList";
-    public  static  String stationDayGenUrl ="/v1/api/stationDayEnergyList";
-    public  static  String stationMonthEnergyList ="/v1/api/stationDayEnergyList";
-    public  static  String stationYearEnergyList ="/v1/api/stationDayEnergyList";
-    public  static  String inverterDayURL ="/v1/api/inverterDay";
-    public  static  String inverterMonthURL ="/v1/api/inverterMonth";
-    public  static  String inverterYearURL ="/v1/api/inverterYear";
+	public static String stationDayGenUrl = "/v1/api/stationDayEnergyList";
+	public static String stationMonthEnergyList = "/v1/api/stationDayEnergyList";
+	public static String stationYearEnergyList = "/v1/api/stationDayEnergyList";
+	public static String inverterDayURL = "/v1/api/inverterDay";
+	public static String inverterMonthURL = "/v1/api/inverterMonth";
+	public static String inverterYearURL = "/v1/api/inverterYear";
 	public static String resovleRule_data_page_records = "data,page,records";
 	public static String resovleRule_data_list = "data,list";
 	public static String resovleRule_data_records = "data,records";
@@ -58,10 +55,9 @@ public class SoFarConstant {
 
 	public static String deviceListItems = "deviceListItems";
 
-    public static String communication="communication";
-
+	public static String communication = "communication";
 
-    public static String stationAlertItems="stationAlertItems";
+	public static String stationAlertItems = "stationAlertItems";
 	public static String dataList = "dataList";
 	public static String paramDataList = "paramDataList";
 	public static String requestPost = "POST";

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/hygf/JpStation.java

@@ -212,7 +212,7 @@ public class JpStation implements Serializable {
     @TableField("day_power_use")
     private Double dayPowerUse;	//	日用电量
     @TableField("month_power_use")
-    private Double monthPowerPse;	//	月用电量
+    private Double monthPowerUse;	//	月用电量
     @TableField("year_power_use")
     private Double yearPowerUse;	//	年用电量
     @TableField("email")

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/SofarStationList.java

@@ -22,8 +22,8 @@ public class SofarStationList {
     private  Integer installedCapacity	;//	装机容量
     private Long  lastUpdateTime	;//电站的最后一条数据更新时间
     private  String   locationAddress	;//	详细地址
-    private  Integer  locationLat	  ;//	纬度
-    private  Integer   locationLng	;//	经度
+    private  String  locationLat	  ;//	纬度
+    private  String  locationLng	;//	经度
     private  String    name	;//	电站名称
     private  String   networkStatus	;//	通信状态
     private  Integer    regionLevel1	;//	行政区1