增加电站转态

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

@@ -18,6 +18,7 @@ public class HYGFJPDayPower implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 
 
 

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

@@ -27,4 +27,5 @@ public class HYGFJPInverterWarn implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 }

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

@@ -18,4 +18,8 @@ public class HYGFJPStationPowerHistory implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
+
+
+
 }

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

@@ -148,6 +148,6 @@ public class TdHYGFInverterDayGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
-
+    private String stationState;//电站状态
 }
 

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

@@ -45,6 +45,7 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
 
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
-    private String amosCompanyCode; //经销商code
+    private String amosCompanyCode; //经销商code、
+    private String stationState;//电站状态
 }
 

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

@@ -48,5 +48,6 @@ public class TdHYGFInverterTotalGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 }
 

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

@@ -46,6 +46,7 @@ public class TdHYGFInverterYearGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 
 }
 

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

@@ -44,5 +44,6 @@ public class TdHYGFStationDayGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 }
 

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

@@ -44,5 +44,6 @@ public class TdHYGFStationMonthGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 }
 

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

@@ -44,5 +44,6 @@ public class TdHYGFStationYearGenerate implements Serializable {
     private String stationName; //名称
     private String regionalCompaniesCode; //区域公司code
     private String amosCompanyCode; //经销商code
+    private String stationState;//电站状态
 }
 

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

@@ -20,5 +20,4 @@ public class TdJpStation implements Serializable {
     private String amosCompanyCode; //经销商code
     private String thirdCode ;//厂商标识
     private  int   isDelete;
-    private String stationName; //名称
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -243,6 +243,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 hygfjpStationPowerHistory.setStationName(jpStation.getName());
+                hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
 
                 hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
@@ -269,6 +270,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 hygfjpDayPower.setStationName(jpStation.getName());
+                hygfjpDayPower.setStationState(jpStation.getState());
 
                 if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                     hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -297,6 +299,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationDayGenerate.setStationName(jpStation.getName());
+                tdHYGFStationDayGenerate.setStationState(jpStation.getState());
 
 
                 if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
@@ -323,6 +326,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+                tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
+
                 if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -348,6 +353,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationYearGenerate.setStationName(jpStation.getName());
+                tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
                 if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                     tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
@@ -699,6 +706,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
                 }
 
@@ -728,6 +736,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
                 }
                 if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
@@ -758,7 +767,9 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
-                }
+                    tdHYGFInverterYearGenerate.setStationState(jpStation.getState());                    }
+
+            }
 
 
 
@@ -790,6 +801,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
+
                 }
                 if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                     tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
@@ -856,8 +869,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                         hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                         hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                         hygfjpInverterWarn.setStationName(jpStation.getName());
-
-                    }
+                        hygfjpInverterWarn.setStationState(jpStation.getState());                    }
 
 
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java

@@ -169,6 +169,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 hygfjpStationPowerHistory.setStationName(jpStation.getName());
+                hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
 
                 hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
@@ -190,6 +191,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 hygfjpDayPower.setStationName(jpStation.getName());
+                hygfjpDayPower.setStationState(jpStation.getState());
 
                 if (org.springframework.util.ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                     hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -216,6 +218,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationDayGenerate.setStationName(jpStation.getName());
+                tdHYGFStationDayGenerate.setStationState(jpStation.getState());
+
                 if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                     tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -242,6 +246,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+                tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
+
                 if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -266,6 +272,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationYearGenerate.setStationName(jpStation.getName());
+                tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
                 if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                     tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
@@ -563,6 +571,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                     tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
                 }
 
@@ -590,6 +599,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                     tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
                 }
 
@@ -626,6 +636,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                     tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
+
                 }
 
                 if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
@@ -657,6 +669,8 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                     tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
+                    tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
+
                 }
                 if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                     tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
@@ -758,6 +772,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                     hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     hygfjpInverterWarn.setStationName(jpStation.getName());
+                    hygfjpInverterWarn.setStationState(jpStation.getState());
 
                 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -343,6 +343,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             hygfjpStationPowerHistory.setStationName(jpStation.getName());
+            hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
 
 
@@ -366,6 +367,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             hygfjpDayPower.setStationName(jpStation.getName());
+            hygfjpDayPower.setStationState(jpStation.getState());
 
             if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                 hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -392,6 +394,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationDayGenerate.setStationName(jpStation.getName());
+            tdHYGFStationDayGenerate.setStationState(jpStation.getState());
 
             if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                 tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
@@ -417,6 +420,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+            tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
+
             if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                 tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -441,6 +446,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationYearGenerate.setStationName(jpStation.getName());
+            tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
             if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
@@ -898,6 +905,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
             }
 
@@ -925,6 +933,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
             }
 
@@ -956,6 +965,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
+                tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
+
             }
 
             if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
@@ -985,6 +996,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
+                tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
+
             }
             if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                 tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
@@ -1059,6 +1072,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                     hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     hygfjpInverterWarn.setStationName(jpStation.getName());
+                    hygfjpInverterWarn.setStationState(jpStation.getState());
 
                 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -275,6 +275,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     hygfjpStationPowerHistory.setStationName(jpStation.getName());
+                    hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
 
 
@@ -297,6 +298,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     hygfjpDayPower.setStationName(jpStation.getName());
+                    hygfjpDayPower.setStationState(jpStation.getState());
 
                     if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                         hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -327,6 +329,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFStationDayGenerate.setStationName(jpStation.getName());
+                    tdHYGFStationDayGenerate.setStationState(jpStation.getState());
+
                     if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                         tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -352,6 +356,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+                    tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
+
                     if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                         tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -376,6 +382,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdHYGFStationYearGenerate.setStationName(jpStation.getName());
+                    tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
                     if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                         tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
@@ -1009,6 +1017,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                         tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                         tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                                        tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
                                     }
 
@@ -1038,6 +1047,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                         tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                         tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                                        tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
                                     }
 
@@ -1070,6 +1080,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                         tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                         tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
+                                        tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
+
                                     }
 
 
@@ -1100,6 +1112,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                         tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                         tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
+                                        tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
+
                                     }
                                     tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
                                     if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
@@ -1403,6 +1417,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                         hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                         hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                         hygfjpInverterWarn.setStationName(jpStation.getName());
+                        hygfjpInverterWarn.setStationState(jpStation.getState());
 
                     }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SofarDataAcquisitionServiceImpl.java

@@ -334,6 +334,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                     hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                     hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     hygfjpDayPower.setStationName(jpStation.getName());
+                    hygfjpDayPower.setStationState(jpStation.getState());
 
                     if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                         hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -400,6 +401,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
             tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationDayGenerate.setStationName(jpStation.getName());
+            tdHYGFStationDayGenerate.setStationState(jpStation.getState());
 
             tdHYGFStationDayGenerate.setFullhour(
 
@@ -442,6 +444,9 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
             tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+            tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
+
+
             if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                 tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -470,6 +475,8 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
             tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationYearGenerate.setStationName(jpStation.getName());
+            tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
             if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
@@ -840,6 +847,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                                 tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
                             }
 
@@ -871,6 +879,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                                 tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
                             }
                             if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
@@ -905,6 +914,8 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                                 tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
+
                             }
 
                             if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java

@@ -323,6 +323,7 @@ public class SunlightServiceImpl implements SunlightService {
                 hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 hygfjpDayPower.setStationName(jpStation.getName());
+                hygfjpDayPower.setStationState(jpStation.getState());
 
                 if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
                     hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
@@ -385,7 +386,10 @@ public class SunlightServiceImpl implements SunlightService {
             tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdHYGFStationDayGenerate.setStationName(jpStation.getName());
-            if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
+                tdHYGFStationDayGenerate.setStationState(jpStation.getState());
+
+
+                if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                 tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
             } else {
@@ -421,6 +425,7 @@ public class SunlightServiceImpl implements SunlightService {
                 tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
+                tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
 
 
 
@@ -452,7 +457,9 @@ public class SunlightServiceImpl implements SunlightService {
                 tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                 tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdHYGFStationYearGenerate.setStationName(jpStation.getName());
-            if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
+                tdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+                if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
             } else {
@@ -697,6 +704,7 @@ public class SunlightServiceImpl implements SunlightService {
                                 tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
                             }
 
@@ -727,6 +735,7 @@ public class SunlightServiceImpl implements SunlightService {
                                 tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
                             }
 
@@ -761,6 +770,8 @@ public class SunlightServiceImpl implements SunlightService {
                                 tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
+
                             }
                             if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                                 tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
@@ -794,6 +805,7 @@ public class SunlightServiceImpl implements SunlightService {
                                 tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                                 tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                                 tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
+                                tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
                             }
 
 
@@ -887,6 +899,7 @@ public class SunlightServiceImpl implements SunlightService {
                        hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
                        hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                        hygfjpInverterWarn.setStationName(jpStation.getName());
+                       hygfjpInverterWarn.setStationState(jpStation.getState());
 
                    }