水库水情详细数据查询接口修改
parent
7cc08a8791
commit
73710b49c3
|
|
@ -182,12 +182,11 @@ public class ReservoirWaterService {
|
||||||
//最新水位时间往前推24小时水位
|
//最新水位时间往前推24小时水位
|
||||||
LocalDateTime now = LocalDateTime.ofInstant(tm.toInstant(), ZoneId.systemDefault());
|
LocalDateTime now = LocalDateTime.ofInstant(tm.toInstant(), ZoneId.systemDefault());
|
||||||
LocalDateTime dateTime = now.minusDays(1);
|
LocalDateTime dateTime = now.minusDays(1);
|
||||||
BigDecimal oldRz = attResBaseMapper.oldRz(stcd,1,Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant()));
|
BigDecimal oldRz = attResBaseMapper.oldRz(stcd,2,Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant()));
|
||||||
|
|
||||||
if(oldRz == null){
|
if(oldRz != null){
|
||||||
return vo;
|
vo.setRzDiff(rz.subtract(oldRz));
|
||||||
}
|
}
|
||||||
vo.setRzDiff(rz.subtract(oldRz));
|
|
||||||
|
|
||||||
//本年最高水位
|
//本年最高水位
|
||||||
BigDecimal maxYearRz = queryYearRzByStcdAndTime(stcd);
|
BigDecimal maxYearRz = queryYearRzByStcdAndTime(stcd);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue