对接第三方北向数据

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

@@ -171,15 +171,15 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     jpStation.setState(KSolarConstant.collectStaus.get(String.valueOf(ksolarStation.getStatus())));
                     jpStation.setRealTimePower(ksolarStation.getPowerInter());
 
-                    jpStation.setDayGenerate(ksolarStation.getDayGeneration() * KSolarConstant.kwhToMwh);
+                    jpStation.setDayGenerate(ksolarStation.getDayGeneration());
                     jpStation.setAccumulatedPower(ksolarStation.getTotalGeneration());
                     jpStation.setArea(ksolarStation.getAddress());
                     // 日收益
                     jpStation.setDayIncome(stationEarn.getDayEarn());
                     // 月发电量
-                    jpStation.setMonthGenerate(stationEarn.getMonthGeneration() * KSolarConstant.kwhToMwh);
+                    jpStation.setMonthGenerate(stationEarn.getMonthGeneration());
                     // 年发电量
-                    jpStation.setYearGenerate(stationEarn.getYearGeneration() * KSolarConstant.kwhToMwh);
+                    jpStation.setYearGenerate(stationEarn.getYearGeneration());
 
                     // 月收益
                     jpStation.setMonthIncome(monthEarn.get("monthEarn"));
@@ -464,10 +464,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             jpInverter.setUpdateTime(new Date());
 
                             jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent());
-                            jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration() * KSolarConstant.kwhToMwh);
-                            jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration() * KSolarConstant.kwhToMwh);
-                            jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration() * KSolarConstant.kwhToMwh);
-                            jpInverter.setTotalPowerGeneration(ksolarStationCollectData.getTotalGeneration() * KSolarConstant.kwhToMwh);
+                            jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
+                            jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
+                            jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());
+                            jpInverter.setTotalPowerGeneration(ksolarStationCollectData.getTotalGeneration());
                             jpInverter.setModel(ksolarStationCollectData.getDeviceModel());
                             jpInverter.setVersion(ksolarStationCollectData.getVersion());
                             jpInverter.setThirdStationId(ksolarStationCollectList.getThirdStationId());