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

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -115,9 +115,9 @@ public class HouseholdTestController {
     public void ksolarnew() throws IOException {
 //        kSolarDataAcquisitionService.stationList();
 //        kSolarDataAcquisitionService.stationList();
-        kSolarDataAcquisitionService.stationDetail();
+//        kSolarDataAcquisitionService.stationDetail();
 //        kSolarDataAcquisitionService.collectorList();
-//        kSolarDataAcquisitionService.collectorDetail();
+        kSolarDataAcquisitionService.collectorDetail();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
 //        goLangDataAcquisitionService.inverterDetail();

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

@@ -171,10 +171,11 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 jpStation.setRealTimePower(golangStationDetail.getPower());
                 jpStation.setOnGridType(GoLangConstant.intoNetWorkStatus.get(String.valueOf(golangStationDetail.getStationtypenew())));
                 jpStation.setDayGenerate(golangStationDetail.getDayenergy());
-                if(!golangStationDetail.getMonthenergystr().toLowerCase().equals("kwh")){
+                if (!golangStationDetail.getMonthenergystr().toLowerCase().equals("kwh")) {
                     jpStation.setMonthGenerate(golangStationDetail.getMonthenergy() * GoLangConstant.mwhTokwh);
+                } else {
+                    jpStation.setMonthGenerate(golangStationDetail.getMonthenergy());
                 }
-                jpStation.setMonthGenerate(golangStationDetail.getMonthenergy());
                 jpStation.setYearGenerate(golangStationDetail.getYearenergy() * GoLangConstant.mwhTokwh);
                 jpStation.setAccumulatedPower(golangStationDetail.getAllenergy() * GoLangConstant.mwhTokwh);
                 jpStation.setDayIncome(golangStationDetail.getDayincome());