锦浪云逆变器数据可能月数据可能是mwh还是kwh问题处理。

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/dto/InverterDetailDto.java

@@ -15,8 +15,13 @@ public class InverterDetailDto {
     private String currentState;
     private Double pac;
     private Double eToday;
+    private String eTodayStr;
     private Double eMonth;
+    private String eMonthStr;
     private Double eYear;
+    private String eYearStr;
+    private Double eTotal;
+    private String eTotalStr;
     private String name;
     private String productModel;
     private String nationalStandards;
@@ -24,7 +29,6 @@ public class InverterDetailDto {
     private Double fullHour;
     private Double power;
     private Double powerFactor;
-    private Double eTotal;
     private Double iAc1;
     private Double iAc2;
     private Double iAc3;

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

@@ -462,9 +462,16 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 jpInverter.setUpdateTime(new Date());
                 jpInverter.setCurrentPower(inverterDetailDto.getPac());
                 jpInverter.setDayPowerGeneration(inverterDetailDto.getEToday());
+                jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth());
+                if(inverterDetailDto.getEMonthStr().toLowerCase().equals("mwh")){
                 jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
-                jpInverter.setYearPowerGeneration(inverterDetailDto.getEYear() * GoLangConstant.mwhTokwh);
+                }
+                if(inverterDetailDto.getEYearStr().toLowerCase().equals("mwh")) {
+                    jpInverter.setYearPowerGeneration(inverterDetailDto.getEYear() * GoLangConstant.mwhTokwh);
+                }
+                if(inverterDetailDto.getETotalStr().toLowerCase().equals("mwh")){
                 jpInverter.setTotalPowerGeneration(inverterDetailDto.getETotal() * GoLangConstant.mwhTokwh);
+                }
                 jpInverter.setBrand(inverterDetailDto.getName());
                 jpInverter.setModel(inverterDetailDto.getProductModel());
                 jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards());
@@ -599,10 +606,11 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setTotalPower(inverterDetailDto.getPac());
                 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.setDayGen(jpInverter.getDayPowerGeneration());
+
+                tdHYGFInverterDayGenerate.setMonthGen(jpInverter.getMonthPowerGeneration());
+                tdHYGFInverterDayGenerate.setYearGen(jpInverter.getYearPowerGeneration());
+                tdHYGFInverterDayGenerate.setTotalGen(jpInverter.getTotalPowerGeneration());
                 tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getInverterTemperature());
                 tdHYGFInverterDayGenerate.setIncome(null);
                 tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());