曾加td 电站信息

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

@@ -221,7 +221,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdJpStation.setThirdStationId(stationIds.get(i));
                 tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
-                tdJpStation.setIsDelete(jpStation.isDelete?0:1);
+                tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
 
                 if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
                     tdJpStationMapper.insert(tdJpStation);

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

@@ -145,7 +145,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdJpStation.setThirdStationId( jpStation.getThirdStationId());
                 tdJpStation.setThirdCode(PVProducerInfoEnum.GDW.getCode());
-                tdJpStation.setIsDelete(jpStation.isDelete?0:1);
+                tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
 
                 if (!org.springframework.util.ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
                     tdJpStationMapper.insert(tdJpStation);

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

@@ -314,7 +314,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             tdJpStation.setThirdStationId( imasterStationList.getPlantCode());
             tdJpStation.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
-            tdJpStation.setIsDelete(jpStation.getIsDelete()?0:1);
+            tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
 
             if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
                 tdJpStationMapper.insert(tdJpStation);

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

@@ -254,7 +254,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdJpStation.setThirdStationId( ksolarStation.getStationId());
                     tdJpStation.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                    tdJpStation.setIsDelete(jpStation.getIsDelete()?0:1);
+                    tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
 
 
                     if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {

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

@@ -142,7 +142,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
             // 并网类型
             jpStation.setOnGridType(SofarRequestUtil.intoNetWorkStatus.get(sunlightDto.getGridInterconnectionType()));
             //第三方厂商标识
-            jpStation.setThirdCode(PVProducerInfoEnum.YG.getCode());
+         //   jpStation.setThirdCode(PVProducerInfoEnum.YG.getCode());
             jpStation.setRecDate(new Date());
 
             //获取单个电站详情
@@ -325,7 +325,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                     tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     tdJpStation.setThirdStationId( jpStation.getThirdStationId());
                     tdJpStation.setThirdCode(PVProducerInfoEnum.SH.getCode());
-                    tdJpStation.setIsDelete(jpStation.getIsDelete()?0:1);
+                    tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
 
                     if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
                         tdJpStationMapper.insert(tdJpStation);

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

@@ -259,9 +259,9 @@ public class SunlightServiceImpl implements SunlightService {
                JSONObject jsonObject22 = JSONUtil.parseObj(jsonObject1nb.get(listd.get(0).getPs_key()), true);
                List<Map> js=  JSONArray.parseArray(JSON.toJSONString(jsonObject22.get("p1")),Map.class);
                // 月发电量
-               jpStation.setMonthGenerate(js.get(0).get("4")!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
+               jpStation.setMonthGenerate(js!=null&&js.get(0).get("4")!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
                // 月收益
-               jpStation.setMonthIncome(js.get(0).get("4")!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
+               jpStation.setMonthIncome(js!=null&&js.get(0).get("4")!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
            }
 
 
@@ -294,9 +294,9 @@ public class SunlightServiceImpl implements SunlightService {
 
                 List<Map> js=  JSONArray.parseArray(JSON.toJSONString(jsonObject23.get("p1")),Map.class);
                 // 年发电量
-                jpStation.setYearGenerate(Double.valueOf(js.get(0).get("4")+"")/1000);
+                jpStation.setYearGenerate(js!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
                 // 年收益
-                jpStation.setYearIncome(Double.valueOf(js.get(0).get("4")+"")/1000);
+                jpStation.setYearIncome(js!=null?Double.valueOf(js.get(0).get("4")+"")/1000:null);
                 if (!ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
                     jpStationMapper.updateById(jpStation);
                 } else {
@@ -317,19 +317,14 @@ public class SunlightServiceImpl implements SunlightService {
                 tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                 tdJpStation.setThirdStationId( jpStation.getThirdStationId());
                 tdJpStation.setThirdCode( PVProducerInfoEnum.YG.getCode());
-                tdJpStation.setIsDelete(jpStation.getIsDelete()?0:1);
+                tdJpStation.setIsDelete(jpStation.getIsDelete()?1:0);
                 if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
                     tdJpStationMapper.insert(tdJpStation);
                 } else {
                     tdJpStation.setCreatedTime(System.currentTimeMillis());
                     tdJpStationMapper.insert(tdJpStation);
                 }
-
-
-
                this.setJpInverte(listd.get(0),jpStation);
-
-
             }