yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
李一帆 2024-08-08 10:26:16 +08:00
parent 86189199fb 1dc4a1b256
commit a2377f064f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
View File

@ -208,7 +208,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
// 两条数据间需要增补几条
int floorNum = (int) Math.floor(diffHours / dt);
for (int j = 0; j < floorNum; j++) {
BigDecimal add = new BigDecimal(drp).divide(BigDecimal.valueOf(floorNum)).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal add = new BigDecimal(drp).divide(BigDecimal.valueOf(floorNum), 2, BigDecimal.ROUND_HALF_UP);
pResultList.add(add.toString());
}
}
@ -337,7 +337,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
// 两条数据的小时差
double diffHours = dateHourDifference(stRsvrR.getTm(), stRsvrRNext.getTm());
int floorNum = (int) Math.floor(diffHours / dt);
BigDecimal meanDifference = new BigDecimal(stRsvrRNext.getRz()).subtract(new BigDecimal(drp)).divide(new BigDecimal(floorNum), BigDecimal.ROUND_HALF_UP, 3);
BigDecimal meanDifference = new BigDecimal(stRsvrRNext.getRz()).subtract(new BigDecimal(drp)).divide(new BigDecimal(floorNum), 3, BigDecimal.ROUND_HALF_UP);
for (int j = 1; j < floorNum; j++) {
// 增补出的数据
StRsvrR suppleStRsvrR = new StRsvrR();