Commit 4a509e7c authored by caotao's avatar caotao

华为场站实时功率如果为0时查询mysql中的实时功率

parent 6c14fbfe
...@@ -2,6 +2,9 @@ package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf; ...@@ -2,6 +2,9 @@ package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter;
import org.apache.ibatis.annotations.Select;
public interface JpInverterMapper extends BaseMapper<JpInverter> { public interface JpInverterMapper extends BaseMapper<JpInverter> {
@Select("SELECT sum(current_power) FROM hygf_jp_inverter WHERE third_code='HW'")
Double getHuaWeiStationCurrentPower();
} }
...@@ -269,6 +269,9 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -269,6 +269,9 @@ public class ImasterDataServiceImpl implements ImasterDataService {
for (ImasterInverterListDetails imasterInverterListDetails : result4) { for (ImasterInverterListDetails imasterInverterListDetails : result4) {
active_power = active_power + (imasterInverterListDetails.getActive_power() != null ? imasterInverterListDetails.getActive_power() : 0.0); active_power = active_power + (imasterInverterListDetails.getActive_power() != null ? imasterInverterListDetails.getActive_power() : 0.0);
} }
if(active_power<= 0){
active_power = jpInverterMapper.getHuaWeiStationCurrentPower();
}
jpStation.setRealTimePower(active_power); jpStation.setRealTimePower(active_power);
jpStation.setAccumulatedPower(imasterStationDetail.getTotal_power()); jpStation.setAccumulatedPower(imasterStationDetail.getTotal_power());
......
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