满发小时数由发电量/额定功率修改为发电量/装机容量

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

@@ -231,7 +231,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
-                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getRatedPower());
+                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
                 tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                     tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
@@ -251,7 +251,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getRatedPower());
+                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
                 tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
@@ -271,7 +271,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
-                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getRatedPower());
+                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
                 tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                     tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
@@ -588,12 +588,12 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setFrequency(String.valueOf(inverterDetailDto.getFac()));
                 tdHYGFInverterDayGenerate.setPowerFactor(inverterDetailDto.getPowerFactor());
                 tdHYGFInverterDayGenerate.setDayGen(inverterDetailDto.getEToday());
-                tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth()*GoLangConstant.mwhTokwh);
-                tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEYear()*GoLangConstant.mwhTokwh);
-                tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal()*GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEYear() * GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal() * GoLangConstant.mwhTokwh);
                 tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getInverterTemperature());
                 tdHYGFInverterDayGenerate.setIncome(null);
-                tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getRatedPower());
+                tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
                 tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
                 //户用场站月发电量
                 Date today1 = new Date();
@@ -610,7 +610,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
-                tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getRatedPower());
+                tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+
                 if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
                     tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
@@ -631,7 +632,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
-                tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getRatedPower());
+                tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+
                 if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                     tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
@@ -652,7 +654,8 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
-                tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getRatedPower());
+                tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+
                 if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                     tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
@@ -711,7 +714,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     }
                     hygfjpInverterWarn.setTimeLong(null);
                     if ((!ObjectUtils.isEmpty(alarmDto.getAlarmBeginTime())) && (!ObjectUtils.isEmpty(alarmDto.getAlarmEndTime()))) {
-                        hygfjpInverterWarn.setTimeLong(golangRequestUtil.convertDate(alarmDto.getAlarmEndTime())-golangRequestUtil.convertDate(alarmDto.getAlarmBeginTime()));
+                        hygfjpInverterWarn.setTimeLong(golangRequestUtil.convertDate(alarmDto.getAlarmEndTime()) - golangRequestUtil.convertDate(alarmDto.getAlarmBeginTime()));
                     }
                     hygfjpInverterWarn.setState(GoLangConstant.alarmstatus.get(alarmDto.getState()));
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {

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

@@ -336,7 +336,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
-            tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getRatedPower());
+            tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
             tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                 tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
@@ -356,7 +356,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-            tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getRatedPower());
+            tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
             tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                 tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
@@ -376,7 +376,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
             tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
-            tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getRatedPower());
+            tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
             tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
@@ -822,37 +822,38 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterDayGenerate.setTotalGen(jpInverter.getTotalPowerGeneration());
             tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getTemperature());
             tdHYGFInverterDayGenerate.setIncome(null);
-            tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
+            tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
             tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
             //户用场站月发电量
             Date today1 = new Date();
-            TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate  = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
-                    .eq("third_station_id",jpInverter.getThirdStationId())
-                    .eq("sn_code",jpInverter.getSnCode())
-                    .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
-                    .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
-            if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate)){
-                tdHYGFInverterMonthGenerate=new TdHYGFInverterMonthGenerate();
+            TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
+                    .eq("third_station_id", jpInverter.getThirdStationId())
+                    .eq("sn_code", jpInverter.getSnCode())
+                    .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
+                    .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
+            if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate)) {
+                tdHYGFInverterMonthGenerate = new TdHYGFInverterMonthGenerate();
             }
             tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
             tdHYGFInverterMonthGenerate.setSnCode(jpInverter.getSnCode().trim());
             tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
-            tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
-            if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())){
+            tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+
+            if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
                 tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
-            }else {
+            } else {
                 tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
             }
             //户用场站年发电量
             TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
-                    .eq("third_station_id",jpInverter.getThirdStationId())
-                    .eq("sn_code",jpInverter.getSnCode())
-                    .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
-                    .eq("year",DateUtil.format(today1, "yyyy")));
-            if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate)){
+                    .eq("third_station_id", jpInverter.getThirdStationId())
+                    .eq("sn_code", jpInverter.getSnCode())
+                    .eq("month_time", DateUtil.format(today1, "yyyy-MM"))
+                    .eq("year", DateUtil.format(today1, "yyyy")));
+            if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate)) {
                 tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
             }
             tdHYGFInverterYearGenerate.setThirdStationId(jpInverter.getThirdStationId());
@@ -860,20 +861,20 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
-            tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration()/jpInverter.getRatedPower());
-            if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())){
+            tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+            if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                 tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
-            }else {
+            } else {
                 tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
             }
             //户用场站年发电量
             TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterTotalGenerate>()
-                    .eq("third_station_id",jpInverter.getThirdStationId())
-                    .eq("sn_code",jpInverter.getSnCode())
-                    .eq("year_time",DateUtil.format(today1, "yyyy"))
-                    .eq("year",DateUtil.format(today1, "yyyy")));
-            if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate)){
+                    .eq("third_station_id", jpInverter.getThirdStationId())
+                    .eq("sn_code", jpInverter.getSnCode())
+                    .eq("year_time", DateUtil.format(today1, "yyyy"))
+                    .eq("year", DateUtil.format(today1, "yyyy")));
+            if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate)) {
                 tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
             }
             tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
@@ -881,11 +882,12 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
-            tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration()/jpInverter.getRatedPower());
-            if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())){
+            tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+
+            if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                 tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
-            }else {
+            } else {
                 tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
             }
         }

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

@@ -50,7 +50,6 @@ import java.util.stream.Collectors;
 public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionService {
 
 
-
     @Autowired
     KsolarRequestUtil kSolarRequestUtil;
 
@@ -188,7 +187,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     // 业主姓名
                     jpStation.setUserName(ksolarStation.getUserName());
                     jpStation.setState(KSolarConstant.collectStaus.get(String.valueOf(ksolarStation.getStatus())));
-                    jpStation.setRealTimePower(ksolarStation.getPowerInter()!=null?ksolarStation.getPowerInter()/1000:0.0);
+                    jpStation.setRealTimePower(ksolarStation.getPowerInter() != null ? ksolarStation.getPowerInter() / 1000 : 0.0);
 
                     jpStation.setDayGenerate(ksolarStation.getDayGeneration());
                     jpStation.setAccumulatedPower(ksolarStation.getTotalGeneration());
@@ -270,62 +269,62 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     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)){
+                            .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(jpStation.getDayGenerate());
-                    tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate()/jpStation.getRatedPower());
+                    tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
                     tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
-                    if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
+                    if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                         tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
-                    }else {
+                    } 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();
+                            .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(jpStation.getMonthGenerate());
-                    tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate()/jpStation.getRatedPower());
+                    tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
                     tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
-                    if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
+                    if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                         tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
-                    }else {
+                    } 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)){
+                            .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(jpStation.getYearGenerate());
-                    tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate()/jpStation.getRatedPower());
+                    tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
                     tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
-                    if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
+                    if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                         tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
                         tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
-                    }else {
+                    } else {
                         tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
                     }
                 }
@@ -528,24 +527,24 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             KsolarStationCollectData.class
                     );
 
-                    if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
+                    if (jpCollectorlist != null && jpCollectorlist.size() > 0) {
 
-                        JpCollector jpCollectorflag=null;
+                        JpCollector jpCollectorflag = null;
                         for (JpCollector jpCollector : jpCollectorlist) {
-                            if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim())&&KSolarConstant.stationStaus.get("1").equals(jpCollector.getState())){
-                                jpCollectorflag=jpCollector;
+                            if (jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim()) && KSolarConstant.stationStaus.get("1").equals(jpCollector.getState())) {
+                                jpCollectorflag = jpCollector;
                                 break;
                             }
                         }
-                        if(jpCollectorflag!=null){
+                        if (jpCollectorflag != null) {
                             //离线状态
                             JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
-                                    eq("sequence_nbr", jpCollectorflag.getSequenceNbr()) );
+                                    eq("sequence_nbr", jpCollectorflag.getSequenceNbr()));
                             if (ObjectUtils.isEmpty(jpInverter)) {
                                 jpInverter = new JpInverter();
                             }
 
-                            jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollectorflag.getName())));
+                            jpInverter.setCapacity(KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollectorflag.getName())));
                             jpInverter.setSnCode(jpInverter.getSnCode());
                             jpInverter.setId(jpInverter.getId());
                             jpInverter.setState(jpCollectorflag.getState());
@@ -571,8 +570,6 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             }
 
 
-
-
                             for (int k1 = 1; k1 < 13; k1++) {
                                 JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
                                         eq("sn_code", jpInverter.getSnCode()).
@@ -706,7 +703,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             }
 
 
-                        }else{
+                        } else {
 
                             if (!CollectionUtils.isEmpty(result)) {
                                 result.forEach(ksolarStationCollectData -> {
@@ -726,10 +723,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 //                        jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
                                     // 装机容量
                                     // jpInverter.setCapacity();
-                                    if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
+                                    if (jpCollectorlist != null && jpCollectorlist.size() > 0) {
                                         for (JpCollector jpCollector : jpCollectorlist) {
-                                            if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim())){
-                                                jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
+                                            if (jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim())) {
+                                                jpInverter.setCapacity(KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
                                             }
                                         }
                                     }
@@ -740,7 +737,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId().trim());
                                     jpInverter.setUpdateTime(new Date());
 
-                                    jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent()!=null?ksolarStationCollectData.getPowerApparent()/1000:null);
+                                    jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent() != null ? ksolarStationCollectData.getPowerApparent() / 1000 : null);
                                     jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
                                     jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
                                     jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());
@@ -934,39 +931,43 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterDayGenerate.setMonthGen(jpInverter.getMonthPowerGeneration());
                                     tdHYGFInverterDayGenerate.setYearGen(jpInverter.getYearPowerGeneration());
                                     tdHYGFInverterDayGenerate.setTotalGen(jpInverter.getTotalPowerGeneration());
-                                    tdHYGFInverterDayGenerate.setIgbtTemp(ObjectUtils.isEmpty(jpInverter.getIgbtTemperature())?null:Double.valueOf(jpInverter.getIgbtTemperature()));
+                                    tdHYGFInverterDayGenerate.setIgbtTemp(ObjectUtils.isEmpty(jpInverter.getIgbtTemperature()) ? null : Double.valueOf(jpInverter.getIgbtTemperature()));
                                     tdHYGFInverterDayGenerate.setIncome(null);
-                                    tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
+                                    tdHYGFInverterDayGenerate.setFullhour(0.0d);
+
+                                    tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+
                                     tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
                                     //户用场站月发电量
                                     Date today1 = new Date();
-                                    TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate  = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
-                                            .eq("third_station_id",jpInverter.getThirdStationId())
-                                            .eq("sn_code",jpInverter.getSnCode())
-                                            .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
-                                            .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate)){
-                                        tdHYGFInverterMonthGenerate=new TdHYGFInverterMonthGenerate();
+                                    TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
+                                            .eq("third_station_id", jpInverter.getThirdStationId())
+                                            .eq("sn_code", jpInverter.getSnCode())
+                                            .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
+                                            .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate)) {
+                                        tdHYGFInverterMonthGenerate = new TdHYGFInverterMonthGenerate();
                                     }
                                     tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
                                     tdHYGFInverterMonthGenerate.setSnCode(jpInverter.getSnCode().trim());
                                     tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                                     tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
-                                    tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())){
+
+                                    tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
                                         tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                                         tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
-                                    }else {
+                                    } else {
                                         tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
                                     }
                                     //户用场站年发电量
                                     TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
-                                            .eq("third_station_id",jpInverter.getThirdStationId())
-                                            .eq("sn_code",jpInverter.getSnCode())
-                                            .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
-                                            .eq("year",DateUtil.format(today1, "yyyy")));
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate)){
+                                            .eq("third_station_id", jpInverter.getThirdStationId())
+                                            .eq("sn_code", jpInverter.getSnCode())
+                                            .eq("month_time", DateUtil.format(today1, "yyyy-MM"))
+                                            .eq("year", DateUtil.format(today1, "yyyy")));
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate)) {
                                         tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
                                     }
                                     tdHYGFInverterYearGenerate.setThirdStationId(jpInverter.getThirdStationId());
@@ -974,20 +975,22 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
-                                    tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration()/jpInverter.getRatedPower());
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())){
+
+                                    tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                                         tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                                         tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
-                                    }else {
+                                    } else {
                                         tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
                                     }
                                     //户用场站年发电量
                                     TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterTotalGenerate>()
-                                            .eq("third_station_id",jpInverter.getThirdStationId())
-                                            .eq("sn_code",jpInverter.getSnCode())
-                                            .eq("year_time",DateUtil.format(today1, "yyyy"))
-                                            .eq("year",DateUtil.format(today1, "yyyy")));
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate)){
+                                            .eq("third_station_id", jpInverter.getThirdStationId())
+                                            .eq("sn_code", jpInverter.getSnCode())
+                                            .eq("year_time", DateUtil.format(today1, "yyyy"))
+                                            .eq("year", DateUtil.format(today1, "yyyy")));
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate)) {
                                         tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
                                     }
                                     tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
@@ -995,11 +998,12 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
-                                    tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration()/jpInverter.getRatedPower());
-                                    if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())){
+                                    tdHYGFInverterTotalGenerate.setFullhour(0.0d);
+                                    tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+                                    if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                                         tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
                                         tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
-                                    }else {
+                                    } else {
                                         tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
                                     }
                                 });
@@ -1012,7 +1016,6 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     }
 
 
-
 //                    if (!CollectionUtils.isEmpty(result)) {
 //                        result.forEach(ksolarStationCollectData -> {
 //                            JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
@@ -1232,11 +1235,11 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
         List<JpInverter> ksdInverterList = jpInverterMapper.selectList(new QueryWrapper<JpInverter>().
                 eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
-        ksdInverterList =ksdInverterList.stream().filter(jpInverter -> !ObjectUtils.isEmpty(jpInverter.getSnCode())).collect(Collectors.toList());
+        ksdInverterList = ksdInverterList.stream().filter(jpInverter -> !ObjectUtils.isEmpty(jpInverter.getSnCode())).collect(Collectors.toList());
 
-        Map<String,String> ksdInverterListMap = new HashMap<>();
+        Map<String, String> ksdInverterListMap = new HashMap<>();
         ksdInverterList.forEach(jpInverter -> {
-            ksdInverterListMap.put(jpInverter.getCollectorId(),jpInverter.getSnCode().trim());
+            ksdInverterListMap.put(jpInverter.getCollectorId(), jpInverter.getSnCode().trim());
         });
 //        ksdInverterList.stream().filter(jpInverter -> !ObjectUtils.isEmpty(jpInverter.getCollectorSnCode())).collect(Collectors.toMap(JpInverter::getCollectorId,JpInverter::getCollectorSnCode));
 
@@ -1260,13 +1263,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 //                    Date startTimeL = sdf.parse(startTime);
 //                    Date recoverTimeL = sdf.parse(recoverTime);
 
-                    String snCode=ksdInverterListMap.get(ksolarAlarmDto.getDeviceId());
-                    if(ObjectUtils.isEmpty(snCode)){
+                    String snCode = ksdInverterListMap.get(ksolarAlarmDto.getDeviceId());
+                    if (ObjectUtils.isEmpty(snCode)) {
                         continue;
                     }
-                    List<HYGFJPInverterWarn> list= hygfjpInverterWarnMapper.selectList(new QueryWrapper<HYGFJPInverterWarn>()
-                            .eq("sn_code",snCode)
-                            .eq("start_time",DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime())
+                    List<HYGFJPInverterWarn> list = hygfjpInverterWarnMapper.selectList(new QueryWrapper<HYGFJPInverterWarn>()
+                            .eq("sn_code", snCode)
+                            .eq("start_time", DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime())
                             .eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
                             .eq("third_station_id", ksolarAlarmDto.getStationId())
                     );
@@ -1286,11 +1289,11 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     hygfjpInverterWarn.setState(KSolarConstant.alarmstatus.get(ksolarAlarmDto.getStatus()));
                     hygfjpInverterWarn.setTimeLong(null);
                     hygfjpInverterWarn.setRecoverTime(null);
-                    if(StringUtils.isNotBlank(ksolarAlarmDto.getRemoveTime())){
+                    if (StringUtils.isNotBlank(ksolarAlarmDto.getRemoveTime())) {
                         hygfjpInverterWarn.setRecoverTime(DateUtil.parse(ksolarAlarmDto.getRemoveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
                     }
-                    if(!ObjectUtils.isEmpty(ksolarAlarmDto.getSaveTime())&&!ObjectUtils.isEmpty(ksolarAlarmDto.getRemoveTime())){
-                        hygfjpInverterWarn.setTimeLong(hygfjpInverterWarn.getRecoverTime()-hygfjpInverterWarn.getStartTime());
+                    if (!ObjectUtils.isEmpty(ksolarAlarmDto.getSaveTime()) && !ObjectUtils.isEmpty(ksolarAlarmDto.getRemoveTime())) {
+                        hygfjpInverterWarn.setTimeLong(hygfjpInverterWarn.getRecoverTime() - hygfjpInverterWarn.getStartTime());
                     }
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
                         hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());