解决冲突

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

@@ -31,6 +31,13 @@ public class TdHYGFStationDayGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    /**
+     * 满发小时数
+     */
     private Double fullhour;
+    /**
+     * 收益
+     */
+    private Double income;
 }
 

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

@@ -31,6 +31,13 @@ public class TdHYGFStationMonthGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    /**
+     * 满发小时数
+     */
     private Double fullhour;
+    /**
+     * 收益
+     */
+    private Double income;
 }
 

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

@@ -31,6 +31,13 @@ public class TdHYGFStationYearGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    /**
+     * 满发小时数
+     */
     private Double fullhour;
+    /**
+     * 收益
+     */
+    private Double income;
 }
 

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

@@ -232,6 +232,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
                 tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate()/jpStation.getCapacity());
+                tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
                 if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
                     tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -251,6 +252,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
                 tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate()/jpStation.getCapacity());
+                tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
                 if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -270,6 +272,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
                 tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate()/jpStation.getCapacity());
+                tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
                 if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
                     tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);

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

@@ -337,6 +337,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
             tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
+            tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                 tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -356,6 +357,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
             tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+            tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                 tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -375,6 +377,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
             tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
+            tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);

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

@@ -278,8 +278,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationDayGenerate.setThirdStationId(stationId);
                     tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                     tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
-                    tdHYGFStationDayGenerate.setGenerate(stationEarn.getDayGeneration());
-                    tdHYGFStationDayGenerate.setFullhour(stationEarn.getDayGeneration()/jpStation.getCapacity());
+                    tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
+                    tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate()/jpStation.getCapacity());
+                    tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
                     if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
                         tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -297,8 +298,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationMonthGenerate.setThirdStationId(stationId);
                     tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                     tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-                    tdHYGFStationMonthGenerate.setGenerate(stationEarn.getMonthGeneration());
-                    tdHYGFStationMonthGenerate.setFullhour(stationEarn.getMonthGeneration()/jpStation.getCapacity());
+                    tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
+                    tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate()/jpStation.getCapacity());
+                    tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
                     if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
                         tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -316,8 +318,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdHYGFStationYearGenerate.setThirdStationId(stationId);
                     tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                     tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
-                    tdHYGFStationYearGenerate.setGenerate(stationEarn.getYearGeneration());
-                    tdHYGFStationYearGenerate.setFullhour(stationEarn.getYearGeneration()/jpStation.getCapacity());
+                    tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
+                    tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate()/jpStation.getCapacity());
+                    tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
                     if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
                         tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);