解决冲突

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

@@ -128,4 +128,5 @@ public class InverterDetailDto {
     private Double pow31;
     private Double pow32;
     private Double inverterTemperature;
+    private Double fac;
 }

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

@@ -584,13 +584,13 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setPv3(inverterDetailDto.getPow3());
                 tdHYGFInverterDayGenerate.setPv4(inverterDetailDto.getPow4());
 
-                tdHYGFInverterDayGenerate.setTotalPower(inverterDetailDto.getPower());
-                tdHYGFInverterDayGenerate.setFrequency(String.valueOf(inverterDetailDto.getPac()));
+                tdHYGFInverterDayGenerate.setTotalPower(inverterDetailDto.getPac());
+                tdHYGFInverterDayGenerate.setFrequency(String.valueOf(inverterDetailDto.getFac()));
                 tdHYGFInverterDayGenerate.setPowerFactor(inverterDetailDto.getPowerFactor());
-                tdHYGFInverterDayGenerate.setDayGen(inverterDetailDto.getEToday());
-                tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth());
-                tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEMonth());
-                tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal());
+                tdHYGFInverterDayGenerate.setDayGen(inverterDetailDto.getEToday()*GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth()*GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEMonth()*GoLangConstant.mwhTokwh);
+                tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal()*GoLangConstant.mwhTokwh);
                 tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getInverterTemperature());
                 tdHYGFInverterDayGenerate.setIncome(null);
                 tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());