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

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);
             }
         }