zzkj/smart_storage_java
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
root
2026-01-28 16:38:18 +08:00
parent d8b1396b6f
commit 8439ec5bdf
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business-service-api/src/main/java/com/ho/business/entity/StationRemoteControl.java
View File

@ -36,7 +36,7 @@ public class StationRemoteControl implements Serializable {
private String intranetIp; private String intranetIp;
@ApiModelProperty(value = "ems页面类型") @ApiModelProperty(value = "ems页面类型")
private Integer type; private String type;
@JsonFormat(pattern = CommonConstant.DATE) @JsonFormat(pattern = CommonConstant.DATE)
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")

7
business-service-dao/src/main/java/com/ho/business/service/impl/OpenStationServiceImpl.java
View File

@ -159,9 +159,10 @@ public class OpenStationServiceImpl implements OpenStationService {
BigDecimal totalReleaseMppt = vo.getTotalRelease() == null ? BigDecimal.ZERO : vo.getTotalRelease().getValue(); BigDecimal totalReleaseMppt = vo.getTotalRelease() == null ? BigDecimal.ZERO : vo.getTotalRelease().getValue();
BigDecimal pvDailyReleaseStart = vo.getPvDailyReleaseStart() == null ? BigDecimal.ZERO : vo.getPvDailyReleaseStart().getValue(); BigDecimal pvDailyReleaseStart = vo.getPvDailyReleaseStart() == null ? BigDecimal.ZERO : vo.getPvDailyReleaseStart().getValue();
BigDecimal dailyReleaseElecMppt = totalReleaseMppt.subtract(pvDailyReleaseStart); BigDecimal dailyReleaseElecMppt = totalReleaseMppt.subtract(pvDailyReleaseStart);
pvActivePower.add(pvActivePowerMppt); dailyReleaseElecMppt = dailyReleaseElecMppt.compareTo(BigDecimal.ZERO)<0?BigDecimal.ZERO:dailyReleaseElecMppt;
totalRelease.add(totalReleaseMppt); pvActivePower = pvActivePower.add(pvActivePowerMppt);
dailyReleaseElec.add(dailyReleaseElecMppt); totalRelease = totalRelease.add(totalReleaseMppt);
dailyReleaseElec = dailyReleaseElec.add(dailyReleaseElecMppt);
} }
} }
} }

3
business-service-dao/src/main/java/com/ho/business/service/impl/StationHomeServiceImpl.java
View File

@ -822,13 +822,16 @@ public class StationHomeServiceImpl implements StationHomeService {
data.setDailyReleaseElec(pv.getDailyReleaseElec()); data.setDailyReleaseElec(pv.getDailyReleaseElec());
//计算累计发电量 //计算累计发电量
BigDecimal totalReleaseElec = elecMeterValueService.selectSumValue(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null); BigDecimal totalReleaseElec = elecMeterValueService.selectSumValue(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
totalReleaseElec = totalReleaseElec.add(pv.getDailyReleaseElec());
data.setTotalReleaseElec(totalReleaseElec); data.setTotalReleaseElec(totalReleaseElec);
//今日收益 //今日收益
String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId(); String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId();
BigDecimal todayIncone = (BigDecimal)redisService.get(key); BigDecimal todayIncone = (BigDecimal)redisService.get(key);
todayIncone = todayIncone==null?BigDecimal.ZERO:todayIncone;
data.setTodayIncone(todayIncone); data.setTodayIncone(todayIncone);
//累计收益 //累计收益
BigDecimal totalIncome = earningsCalculateMpptService.countAllPvIncome(station.getId(),null,null); BigDecimal totalIncome = earningsCalculateMpptService.countAllPvIncome(station.getId(),null,null);
totalIncome = totalIncome.add(todayIncone);
data.setTotalIncome(totalIncome); data.setTotalIncome(totalIncome);
//额定功率(光伏) //额定功率(光伏)
data.setPvPower(station.getPvPower()); data.setPvPower(station.getPvPower());

2
business-service-dao/src/main/resources/mapper/StationRemoteControlMapper.xml
View File

@ -28,7 +28,7 @@
<if test="entity.userName != null">#{entity.userName,jdbcType=VARCHAR},</if> <if test="entity.userName != null">#{entity.userName,jdbcType=VARCHAR},</if>
<if test="entity.password != null">#{entity.password,jdbcType=VARCHAR},</if> <if test="entity.password != null">#{entity.password,jdbcType=VARCHAR},</if>
<if test="entity.intranetIp != null">#{entity.intranetIp,jdbcType=VARCHAR},</if> <if test="entity.intranetIp != null">#{entity.intranetIp,jdbcType=VARCHAR},</if>
<if test="entity.type != null">#{entity.type,jdbcType=INTEGER},</if> <if test="entity.type != null">#{entity.type,jdbcType=VARCHAR},</if>
<if test="entity.createTime != null">#{entity.createTime,jdbcType=TIMESTAMP},</if> <if test="entity.createTime != null">#{entity.createTime,jdbcType=TIMESTAMP},</if>
<if test="entity.updateTime != null">#{entity.updateTime,jdbcType=TIMESTAMP},</if> <if test="entity.updateTime != null">#{entity.updateTime,jdbcType=TIMESTAMP},</if>
</trim> </trim>