diff --git a/src/main/java/com/gunshi/project/xyt/service/StQxWarnRService.java b/src/main/java/com/gunshi/project/xyt/service/StQxWarnRService.java index 032bffd..a3ed0b4 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StQxWarnRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StQxWarnRService.java @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; @@ -65,20 +66,20 @@ public class StQxWarnRService extends ServiceImpl { BigDecimal rz = attResBaseVo.getRz(); if (attResBaseVo.getCalState() == 1) { BigDecimal aboveCal = rz.subtract(attResBaseVo.getCalFloodLev()); - vo.setRzWarn("超校核(" + aboveCal + ")"); + vo.setRzWarn("超校核(" + aboveCal.setScale(1, RoundingMode.HALF_UP) + "m)"); attResBaseVo.setDesState(0); attResBaseVo.setFlState(0); } else if (attResBaseVo.getDesState() == 1) { BigDecimal aboveDes = rz.subtract(attResBaseVo.getDesFloodLev()); - vo.setRzWarn("超设计(" + aboveDes + ")"); + vo.setRzWarn("超设计(" + aboveDes.setScale(1, RoundingMode.HALF_UP) + "m)"); attResBaseVo.setFlState(0); } else if (attResBaseVo.getFlState() == 1) { - vo.setRzWarn("超汛限(" + attResBaseVo.getAFsltdz() + ")"); + vo.setRzWarn("超汛限(" + attResBaseVo.getAFsltdz().setScale(1, RoundingMode.HALF_UP) + "m)"); } else if (rz.compareTo(attResBaseVo.getDeadLev()) < 0) { BigDecimal aboveDead = rz.subtract(attResBaseVo.getDeadLev()); - vo.setRzWarn("低水位(" + aboveDead + ")"); + vo.setRzWarn("低水位(" + aboveDead.setScale(1, RoundingMode.HALF_UP) + "m)"); } else { - vo.setRzWarn("正常(" + attResBaseVo.getAFsltdz() + ")"); + vo.setRzWarn("正常(" + attResBaseVo.getAFsltdz().setScale(1, RoundingMode.HALF_UP) + "m)"); } }