1.对于逆变器sncode字段进行去空处理。

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

@@ -444,7 +444,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 if (ObjectUtils.isEmpty(jpInverter)) {
                     jpInverter = new JpInverter();
                 }
-                jpInverter.setSnCode(inverterDetailDto.getSn());
+                jpInverter.setSnCode(inverterDetailDto.getSn().trim());
                 jpInverter.setState(GoLangConstant.stationStaus.get(inverterDetailDto.getCurrentState()));
                 jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId()));
                 jpInverter.setCollectorSnCode(inverterDetailDto.getCollectorsn());
@@ -556,7 +556,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 TdHYGFInverterDayGenerate tdHYGFInverterDayGenerate = new TdHYGFInverterDayGenerate();
                 tdHYGFInverterDayGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterDayGenerate.setThirdStationId(String.valueOf(jpInverter.getThirdStationId()));
-                tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode().trim());
                 tdHYGFInverterDayGenerate.setWorkStatus(jpInverter.getState());
                 //交流电压
                 tdHYGFInverterDayGenerate.setDcv1(inverterDetailDto.getUAc1());
@@ -606,7 +606,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterMonthGenerate = new TdHYGFInverterMonthGenerate();
                 }
                 tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                tdHYGFInverterMonthGenerate.setSnCode(String.valueOf(jpInverter.getSnCode()));
+                tdHYGFInverterMonthGenerate.setSnCode(jpInverter.getSnCode().trim());
                 tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
@@ -627,7 +627,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
                 }
                 tdHYGFInverterYearGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode().trim());
                 tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
@@ -648,7 +648,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
                 }
                 tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
                 tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());

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

@@ -591,7 +591,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 jpInverter = new JpInverter();
             }
             jpInverter.setCapacity(ImasterConstant.Capacity.get(imasterInverterList.getDevName()));
-            jpInverter.setSnCode(imasterInverterList.getEsnCode());
+            jpInverter.setSnCode(imasterInverterList.getEsnCode().trim());
             jpInverter.setAddr(imasterInverterList.getAddr());
             jpInverter.setCollectorSnCode(collectorList.getEsnCode());
             jpInverter.setCollectorId(String.valueOf(collectorList.getId()));
@@ -768,7 +768,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             hygfjpInverterHistory.setDate(today);
             hygfjpInverterHistory.setThirdStationId(String.valueOf(imasterInverterList.getStationCode()));
             hygfjpInverterHistory.setInverterId(String.valueOf(imasterInverterList.getId()));
-            hygfjpInverterHistory.setSnCode(imasterInverterList.getEsnCode());
+            hygfjpInverterHistory.setSnCode(jpInverter.getSnCode().trim());
             hygfjpInverterHistory.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
             // hygfjpInverterHistory.setGenerationHours(inverterDetailDto.getFullHour());
             hygfjpInverterHistory.setPowerGeneration(inverterDetailDto.getDay_cap());
@@ -835,7 +835,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterMonthGenerate=new TdHYGFInverterMonthGenerate();
             }
             tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
-            tdHYGFInverterMonthGenerate.setSnCode(String.valueOf(jpInverter.getSnCode()));
+            tdHYGFInverterMonthGenerate.setSnCode(jpInverter.getSnCode().trim());
             tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
@@ -856,7 +856,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
             }
             tdHYGFInverterYearGenerate.setThirdStationId(jpInverter.getThirdStationId());
-            tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode());
+            tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode().trim());
             tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
@@ -877,7 +877,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
             }
             tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
-            tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode());
+            tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
             tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());

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

@@ -732,7 +732,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                             }
                                         }
                                     }
-                                    jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
+                                    jpInverter.setSnCode(ksolarStationCollectData.getInverterId().trim());
                                     jpInverter.setId(ksolarStationCollectData.getInverterId());
                                     jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus()));
                                     jpInverter.setCollectorId(ksolarStationCollectList.getCollectId());
@@ -882,7 +882,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                     hygfjpInverterHistory.setDate(today);
                                     hygfjpInverterHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
                                     hygfjpInverterHistory.setInverterId(ksolarStationCollectData.getInverterId());
-                                    hygfjpInverterHistory.setSnCode(ksolarStationCollectData.getInverterId());
+                                    hygfjpInverterHistory.setSnCode(jpInverter.getSnCode().trim());
                                     hygfjpInverterHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
                                     hygfjpInverterHistory.setPowerGeneration(ksolarStationCollectData.getTotalGeneration());
                                     if (ObjectUtils.isEmpty(hygfjpInverterHistory.getCreatedTime())) {
@@ -948,7 +948,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterMonthGenerate=new TdHYGFInverterMonthGenerate();
                                     }
                                     tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                                    tdHYGFInverterMonthGenerate.setSnCode(String.valueOf(jpInverter.getSnCode()));
+                                    tdHYGFInverterMonthGenerate.setSnCode(jpInverter.getSnCode().trim());
                                     tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                                     tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
@@ -969,7 +969,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
                                     }
                                     tdHYGFInverterYearGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                                    tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode());
+                                    tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode().trim());
                                     tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                                     tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
@@ -990,7 +990,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                         tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
                                     }
                                     tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                                    tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode());
+                                    tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
                                     tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                                     tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());