Commit d9a8b33b authored by xixinzhao's avatar xixinzhao

修改保存逆变器id

parent 4c738081
...@@ -150,7 +150,7 @@ public class JpInverter implements Serializable { ...@@ -150,7 +150,7 @@ public class JpInverter implements Serializable {
* ID * ID
*/ */
@TableField("ID") @TableField("ID")
private Long id; private String id;
/** /**
* 第三方电站id * 第三方电站id
......
...@@ -377,7 +377,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -377,7 +377,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards()); jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards());
jpInverter.setVersion(inverterDetailDto.getVersion()); jpInverter.setVersion(inverterDetailDto.getVersion());
jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour())); jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
jpInverter.setId(inverterDetailDto.getId()); jpInverter.setId(String.valueOf(inverterDetailDto.getId()));
jpInverter.setCapacity(inverterDetailDto.getPower().intValue()); jpInverter.setCapacity(inverterDetailDto.getPower().intValue());
jpInverter.setThirdStationId(String.valueOf(inverterDetailDto.getStationId())); jpInverter.setThirdStationId(String.valueOf(inverterDetailDto.getStationId()));
jpInverter.setThirdCode(PVProducerInfoEnum.JLY.getCode()); jpInverter.setThirdCode(PVProducerInfoEnum.JLY.getCode());
......
...@@ -535,7 +535,7 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -535,7 +535,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
// jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards()); // jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards());
jpInverter.setVersion(imasterInverterList.getSoftwareVersion()); jpInverter.setVersion(imasterInverterList.getSoftwareVersion());
// jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour())); // jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
jpInverter.setId(imasterInverterList.getId()); jpInverter.setId(String.valueOf(imasterInverterList.getId()));
// jpInverter.setCapacity(inverterDetailDto.getPower().intValue()); // jpInverter.setCapacity(inverterDetailDto.getPower().intValue());
jpInverter.setThirdStationId(String.valueOf(imasterInverterList.getStationCode())); jpInverter.setThirdStationId(String.valueOf(imasterInverterList.getStationCode()));
jpInverter.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode()); jpInverter.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
......
...@@ -458,6 +458,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -458,6 +458,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
// jpInverter.setCapacity(inverterDetailDto.getPower().intValue()); // jpInverter.setCapacity(inverterDetailDto.getPower().intValue());
jpInverter.setSnCode(ksolarStationCollectData.getInverterId()); jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
jpInverter.setId(ksolarStationCollectData.getInverterId());
jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus())); jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus()));
jpInverter.setCollectorId(ksolarStationCollectList.getCollectId()); jpInverter.setCollectorId(ksolarStationCollectList.getCollectId());
jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId()); jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment