修改bug

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

@@ -112,16 +112,18 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 jpStation.setAddress(goodWeStationList.getAddress());
                 jpStation.setLatitude(goodWeStationList.getLatitude());
                 jpStation.setLongitude(goodWeStationList.getLongitude());
-                jpStation.setUserName(goodWeStationList.getOwner_name());
+                jpStation.setUserName(goodWeStationList.getOwner_name()==null?goodWeStationList.getStationname():goodWeStationList.getOwner_name());
                 jpStation.setUserPhone(goodWeStationList.getOwner_phone());
                 jpStation.setStationContact(goodWeStationList.getOwner_name());
                 jpStation.setModuleCount(0);
-                jpStation.setRealTimePower(goodWeStationList.getPac() * GoodWeConstant.wToKw);
-                jpStation.setState(GoodWeConstant.stationStaus.get(goodWeStationList.getStatus()+""));
+                jpStation.setRealTimePower(goodWeStationList.getPac()!=null?goodWeStationList.getPac() * GoodWeConstant.wToKw:null);
+                jpStation.setState(goodWeStationList.getStatus()!=null?GoodWeConstant.stationStaus.get(goodWeStationList.getStatus()+""):null);
                 jpStation.setDayGenerate(goodWeStationList.getEday());
                 jpStation.setDayIncome(goodWeStationList.getEday_income());
                 jpStation.setAccumulatedPower(goodWeStationList.getEtotal());
                 jpStation.setCumulativeIncome(goodWeStationList.getEtotal_income());
+
+
                 if (ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
                     jpStation.setCreateTime(new Date(goodWeStationList.getCreatedTime()));
                     if (ObjectUtils.isNotEmpty(goodWeStationList.getTurnon_time())) {
@@ -134,7 +136,6 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 }
 
 
-
                 //增加td 电站区域公司，经销商绑定表
 //                TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
 //                        eq("third_code",PVProducerInfoEnum.GDW.getCode()).