Commit 323862c1 authored by tangwei's avatar tangwei

修改bug

parent ac0982af
...@@ -274,7 +274,7 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -274,7 +274,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
jpStation.setDayIncome(imasterStationDetail.getDay_income()); jpStation.setDayIncome(imasterStationDetail.getDay_income());
jpStation.setCumulativeIncome(imasterStationDetail.getTotal_income()); //jpStation.setCumulativeIncome(imasterStationDetail.getTotal_income());
jpStation.setState(ImasterConstant.stationStaus.get(String.valueOf(imasterStationDetail.getReal_health_state()))); jpStation.setState(ImasterConstant.stationStaus.get(String.valueOf(imasterStationDetail.getReal_health_state())));
// jpStation.setDayIncome(imasterStationDetail.getDayIncome()); // jpStation.setDayIncome(imasterStationDetail.getDayIncome());
// jpStation.setMonthIncome(imasterStationDetail.getMonthincome()); // jpStation.setMonthIncome(imasterStationDetail.getMonthincome());
......
...@@ -468,13 +468,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -468,13 +468,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
if(jpCollectorlist!=null&&jpCollectorlist.size()>0){ if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
for (JpCollector jpCollector : jpCollectorlist) { for (JpCollector jpCollector : jpCollectorlist) {
if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId())){ if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId())){
jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName()))); jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
} }
} }
} }
jpInverter.setSnCode(ksolarStationCollectData.getInverterId()); jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
jpInverter.setId(ksolarStationCollectData.getInverterId()); jpInverter.setId(ksolarStationCollectData.getInverterId());
jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus())); jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus()));
......
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