修改逆变器采集名称

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

@@ -790,6 +790,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterDayGenerate.setCreatedTime(System.currentTimeMillis());
             tdHYGFInverterDayGenerate.setThirdStationId(jpInverter.getThirdStationId());
             tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode());
+            tdHYGFInverterDayGenerate.setName(jpInverter.getName());
             tdHYGFInverterDayGenerate.setWorkStatus(jpInverter.getState());
             //交流电压
             tdHYGFInverterDayGenerate.setDcv1(jpInverterElectricityR.getVoltage());
@@ -846,7 +847,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
             tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
-
+            tdHYGFInverterMonthGenerate.setName(jpInverter.getName());
             if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
                 tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
@@ -868,6 +869,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
             tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+            tdHYGFInverterYearGenerate.setName(jpInverter.getName());
             if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                 tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
@@ -889,6 +891,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
             tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+            tdHYGFInverterTotalGenerate.setName(jpInverter.getName());
 
             if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                 tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());

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

@@ -713,9 +713,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                             like("sn_code", ksolarStationCollectData.getInverterId().trim())
                                             .isNotNull("sn_code")
                                             .orderByDesc("update_time"));
-                                    JpInverter jpInverter =jpInverterList.get(0);
-                                    if (ObjectUtils.isEmpty(jpInverter)) {
-                                        jpInverter = new JpInverter();
+                                    JpInverter jpInverter = new JpInverter();
+                                    if (!ObjectUtils.isEmpty(jpInverterList)) {
+                                        jpInverter =jpInverterList.get(0);
                                     }
 
                                     // 品牌
@@ -901,6 +901,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterDayGenerate.setCreatedTime(System.currentTimeMillis());
                                     tdHYGFInverterDayGenerate.setThirdStationId(jpInverter.getThirdStationId());
                                     tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode());
+                                    tdHYGFInverterDayGenerate.setName(jpInverter.getName());
                                     tdHYGFInverterDayGenerate.setWorkStatus(jpInverter.getState());
                                     //交流电压
                                     tdHYGFInverterDayGenerate.setDcv1(jpInverterElectricityR.getVoltage());
@@ -959,6 +960,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                                     tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
+                                    tdHYGFInverterMonthGenerate.setName(jpInverter.getName());
 
                                     tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
                                     if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
@@ -981,6 +983,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
+                                    tdHYGFInverterYearGenerate.setName(jpInverter.getName());
 
                                     tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
 
@@ -1005,6 +1008,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
                                     tdHYGFInverterTotalGenerate.setFullhour(0.0d);
+                                    tdHYGFInverterTotalGenerate.setName(jpInverter.getName());
+
                                     tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
                                     if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                                         tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());