Merge remote-tracking branch 'origin/developer' into developer

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

@@ -31,5 +31,6 @@ public class TdHYGFStationDayGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

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

@@ -31,5 +31,6 @@ public class TdHYGFStationMonthGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

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

@@ -31,5 +31,6 @@ public class TdHYGFStationYearGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

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

@@ -227,7 +227,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationDayGenerate.setThirdStationId(stationIds.get(i));
                 tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
-                tdHYGFStationDayGenerate.setGenerate(golangStationDetail.getDayenergy());
+                tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
+                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate()/jpStation.getCapacity());
                 if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
                     tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
@@ -245,7 +246,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setThirdStationId(stationIds.get(i));
                 tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-                tdHYGFStationMonthGenerate.setGenerate(golangStationDetail.getMonthenergy());
+                tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
+                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate()/jpStation.getCapacity());
                 if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
@@ -263,7 +265,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationYearGenerate.setThirdStationId(stationIds.get(i));
                 tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
-                tdHYGFStationYearGenerate.setGenerate(golangStationDetail.getYearenergy());
+                tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
+                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate()/jpStation.getCapacity());
                 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

@@ -118,6 +118,20 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     JpInverterElectricityMapper jpInverterElectricityMapper;
 
 
+    @Autowired
+    private TdHYGFInverterDayGenerateMapper tdHYGFInverterDayGenerateMapper;
+    @Autowired
+    private TdHYGFInverterMonthGenerateMapper tdHYGFInverterMonthGenerateMapper;
+    @Autowired
+    private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
+    @Autowired
+    private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
+    @Autowired
+    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    @Autowired
+    private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
+
+
     @Scheduled(cron = "${dataRequstScheduled.huawei}")
     @Override
     public void stationList() {
@@ -190,10 +204,6 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 ImasterInverterListDetails.class
         );
 
-
-
-
-
             for (int j = 0; j < result.size(); j++) {
                 QueryWrapper<ImasterStationList> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("plant_code", result.get(j).getStationCode());
@@ -329,6 +339,64 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 } else {
                     hygfjpDayPowerMapper.insert(hygfjpDayPower);
                 }
+                Date today1 = new Date();
+                //户用场站日发电量
+                TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>()
+                        .eq("third_station_id",jpStation.getThirdStationId())
+                        .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
+                        .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
+                if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate)){
+                    tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+                }
+                tdHYGFStationDayGenerate.setThirdStationId(jpStation.getThirdStationId());
+                tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
+                tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
+                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate()/jpStation.getCapacity());
+                if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
+                    tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                }else {
+                    tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                }
+                //户用场站月发电量
+                TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
+                        .eq("third_station_id",jpStation.getThirdStationId())
+                        .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)){
+                    tdHYGFStationMonthGenerate=new TdHYGFStationMonthGenerate();
+                }
+                tdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
+                tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
+                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate()/jpStation.getCapacity());
+                if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
+                    tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                }else {
+                    tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                }
+                //户用场站年发电量
+                TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
+                        .eq("third_station_id",jpStation.getThirdStationId())
+                        .eq("year_time",DateUtil.format(today1, "yyyy"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate)){
+                    tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
+                }
+                tdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId());
+                tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
+                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate()/jpStation.getCapacity());
+                if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
+                    tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                }else {
+                    tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                }
             }
         this.inverterDetail(result4);
     }

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

@@ -94,6 +94,18 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
     //监盘逆变器电量mapper
     @Autowired
     private JpInverterElectricityMapper jpInverterElectricityMapper;
+    @Autowired
+    private TdHYGFInverterDayGenerateMapper tdHYGFInverterDayGenerateMapper;
+    @Autowired
+    private TdHYGFInverterMonthGenerateMapper tdHYGFInverterMonthGenerateMapper;
+    @Autowired
+    private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
+    @Autowired
+    private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
+    @Autowired
+    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    @Autowired
+    private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
 
     @Scheduled(cron = "${dataRequstScheduled.keshida}")
     @Override
@@ -252,6 +264,64 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     ksolarStationDetail.setCreatedTime(System.currentTimeMillis());
 
                     ksolarStationDetailsMapper.insert(ksolarStationDetail);
+                    Date today1 = new Date();
+                    //户用场站日发电量
+                    TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>()
+                            .eq("third_station_id",stationId)
+                            .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
+                            .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
+                    if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate)){
+                        tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+                    }
+                    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());
+                    if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
+                        tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+                        tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                    }else {
+                        tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                    }
+                    //户用场站月发电量
+                    TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
+                            .eq("third_station_id",stationId)
+                            .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
+                            .eq("year",DateUtil.format(today1, "yyyy")));
+                    if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)){
+                        tdHYGFStationMonthGenerate=new TdHYGFStationMonthGenerate();
+                    }
+                    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());
+                    if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
+                        tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
+                        tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                    }else {
+                        tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                    }
+                    //户用场站年发电量
+                    TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
+                            .eq("third_station_id",stationId)
+                            .eq("year_time",DateUtil.format(today1, "yyyy"))
+                            .eq("year",DateUtil.format(today1, "yyyy")));
+                    if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate)){
+                        tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
+                    }
+                    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());
+                    if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
+                        tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+                        tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                    }else {
+                        tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                    }
                 }
             }
         }