1.科士达疯狂新增逆变器,采集器问题修改.

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

@@ -59,8 +59,8 @@ public class HouseholdTestController {
     @PostMapping(value = "/golangnew")
     @ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
     public void golangnew() throws IOException {
-//        goLangDataAcquisitionService.stationList();
-          goLangDataAcquisitionService.stationDetail();
+        goLangDataAcquisitionService.stationList();
+//          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
@@ -114,10 +114,10 @@ public class HouseholdTestController {
     @ApiOperation(httpMethod = "POST", value = "科士达", notes = "科士达")
     public void ksolarnew() throws IOException {
 //        kSolarDataAcquisitionService.stationList();
-        kSolarDataAcquisitionService.stationList();
+//        kSolarDataAcquisitionService.stationList();
         kSolarDataAcquisitionService.stationDetail();
-        kSolarDataAcquisitionService.collectorList();
-        kSolarDataAcquisitionService.collectorDetail();
+//        kSolarDataAcquisitionService.collectorList();
+//        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

@@ -29,10 +29,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Array;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Async
@@ -173,7 +171,10 @@ 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")){
                     jpStation.setMonthGenerate(golangStationDetail.getMonthenergy() * GoLangConstant.mwhTokwh);
+                }
+                jpStation.setMonthGenerate(golangStationDetail.getMonthenergy());
                 jpStation.setYearGenerate(golangStationDetail.getYearenergy() * GoLangConstant.mwhTokwh);
                 jpStation.setAccumulatedPower(golangStationDetail.getAllenergy() * GoLangConstant.mwhTokwh);
                 jpStation.setDayIncome(golangStationDetail.getDayincome());

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

@@ -539,7 +539,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                         if (jpCollectorflag != null) {
                             //离线状态
                             JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
-                                    eq("sequence_nbr", jpCollectorflag.getSequenceNbr()));
+                                    eq("collector_sn_code", jpCollectorflag.getSnCode().trim()) );
                             if (ObjectUtils.isEmpty(jpInverter)) {
                                 jpInverter = new JpInverter();
                             }
@@ -707,10 +707,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
                             if (!CollectionUtils.isEmpty(result)) {
                                 result.forEach(ksolarStationCollectData -> {
-                                    JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
+                                    List<JpInverter> jpInverterList = jpInverterMapper.selectList(new QueryWrapper<JpInverter>().
                                             eq("third_station_id", ksolarStationCollectList.getThirdStationId()).
                                             eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()).
-                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()));
+                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim())
+                                            .isNotNull("sn_code")
+                                            .orderByDesc("update_time"));
+                                    JpInverter jpInverter =jpInverterList.get(0);
                                     if (ObjectUtils.isEmpty(jpInverter)) {
                                         jpInverter = new JpInverter();
                                     }