Ver código fonte

调用决策的时候,报警项的真实值保留两位小数

王苗苗 7 meses atrás
pai
commit
daf4042ed1

+ 14 - 13
slibra-common/src/main/java/com/slibra/common/utils/format/WaterFormat.java

@@ -21,29 +21,30 @@ public class WaterFormat {
     public static DecisionReq getWaterDecimationData(DecisionReq decisionReq, TXinyiDaily daily ) {
         // 格式化小数
         // 溶解氧1位 碳源投加量 2位 其他都是整数
-        decisionReq.setCodIn(DecimalUtils.getAbsAndScale(decisionReq.getCodIn(), INT_0));
+        //2024年08月26日19:58:28 所有报警相关的真实值改成两位小数ßß
+        decisionReq.setCodIn(DecimalUtils.getAbsAndScale(decisionReq.getCodIn(), INT_2));
         decisionReq.setCodInName(DecimalUtils.getAbsAndScale(decisionReq.getCodInName(), INT_0));
-        decisionReq.setCodOff(DecimalUtils.getAbsAndScale(decisionReq.getCodOff(), INT_0));
+        decisionReq.setCodOff(DecimalUtils.getAbsAndScale(decisionReq.getCodOff(), INT_2));
         decisionReq.setCodOffName(DecimalUtils.getAbsAndScale(decisionReq.getCodOffName(), INT_0));
         decisionReq.setCodOffCon(DecimalUtils.getAbsAndScale(decisionReq.getCodOffCon(), INT_0));
-        decisionReq.setTpIn(DecimalUtils.getAbsAndScale(decisionReq.getTpIn(), INT_0));
+        decisionReq.setTpIn(DecimalUtils.getAbsAndScale(decisionReq.getTpIn(), INT_2));
         decisionReq.setTpInName(DecimalUtils.getAbsAndScale(decisionReq.getTpInName(), INT_0));
-        decisionReq.setTpOff(DecimalUtils.getAbsAndScale(decisionReq.getTpOff(), INT_0));
+        decisionReq.setTpOff(DecimalUtils.getAbsAndScale(decisionReq.getTpOff(), INT_2));
         decisionReq.setTpOffName(DecimalUtils.getAbsAndScale(decisionReq.getTpOffName(), INT_0));
         decisionReq.setTpOffCon(DecimalUtils.getAbsAndScale(decisionReq.getTpOffCon(), INT_0));
-        decisionReq.setTnIn(DecimalUtils.getAbsAndScale(decisionReq.getTnIn(), INT_0));
+        decisionReq.setTnIn(DecimalUtils.getAbsAndScale(decisionReq.getTnIn(), INT_2));
         decisionReq.setTnInName(DecimalUtils.getAbsAndScale(decisionReq.getTnInName(), INT_0));
-        decisionReq.setTnOff(DecimalUtils.getAbsAndScale(decisionReq.getTnOff(), INT_0));
+        decisionReq.setTnOff(DecimalUtils.getAbsAndScale(decisionReq.getTnOff(), INT_2));
         decisionReq.setTnOffName(DecimalUtils.getAbsAndScale(decisionReq.getTnOffName(), INT_0));
         decisionReq.setTnOffCon(DecimalUtils.getAbsAndScale(decisionReq.getTnOffCon(), INT_0));
-        decisionReq.setAddanIn(DecimalUtils.getAbsAndScale(decisionReq.getAddanIn(), INT_0));
+        decisionReq.setAddanIn(DecimalUtils.getAbsAndScale(decisionReq.getAddanIn(), INT_2));
         decisionReq.setAddanInName(DecimalUtils.getAbsAndScale(decisionReq.getAddanInName(), INT_0));
-        decisionReq.setAndanOff(DecimalUtils.getAbsAndScale(decisionReq.getAndanOff(), INT_0));
+        decisionReq.setAndanOff(DecimalUtils.getAbsAndScale(decisionReq.getAndanOff(), INT_2));
         decisionReq.setAndanOffName(DecimalUtils.getAbsAndScale(decisionReq.getAndanOffName(), INT_0));
         decisionReq.setAndanOffCon(DecimalUtils.getAbsAndScale(decisionReq.getAndanOffCon(), INT_0));
-        decisionReq.setSsIn(DecimalUtils.getAbsAndScale(decisionReq.getSsIn(), INT_0));
+        decisionReq.setSsIn(DecimalUtils.getAbsAndScale(decisionReq.getSsIn(), INT_2));
         decisionReq.setSsInName(DecimalUtils.getAbsAndScale(decisionReq.getSsInName(), INT_0));
-        decisionReq.setSsOff(DecimalUtils.getAbsAndScale(decisionReq.getSsOff(), INT_0));
+        decisionReq.setSsOff(DecimalUtils.getAbsAndScale(decisionReq.getSsOff(), INT_2));
         decisionReq.setSsOffName(DecimalUtils.getAbsAndScale(decisionReq.getSsOffName(), INT_0));
         decisionReq.setSsOffCon(DecimalUtils.getAbsAndScale(decisionReq.getSsOffCon(), INT_0));
         decisionReq.setTdsIn(DecimalUtils.getAbsAndScale(decisionReq.getTdsIn(), INT_0));
@@ -142,9 +143,9 @@ public class WaterFormat {
         if(StringUtils.isNotBlank(hycxsyAll)){//好氧
             List<BigDecimal> hyStrings = JSON.parseArray(hycxsyAll, BigDecimal.class);
             BigDecimal no3Hlj1Jqr = hyStrings.get(0);
-            decisionReq.setTnOffLxjc1(DecimalUtils.getAbsAndScale(no3Hlj1Jqr, INT_0));
+            decisionReq.setTnOffLxjc1(DecimalUtils.getAbsAndScale(no3Hlj1Jqr, INT_2));
             BigDecimal no3Hlj2Jqr = hyStrings.get(1);
-            decisionReq.setTnOffLxjc2(DecimalUtils.getAbsAndScale(no3Hlj2Jqr, INT_0));
+            decisionReq.setTnOffLxjc2(DecimalUtils.getAbsAndScale(no3Hlj2Jqr, INT_2));
             //处理氨氮 需要计算
             //缺氧硝酸盐
             String qyckxsyAll = decisionReq.getQyckxsyAll();
@@ -160,7 +161,7 @@ public class WaterFormat {
                     BigDecimal nh32Jqr = qyStrings2.get(1);
                     BigDecimal anDan1 = no3Qyc1Jqr.add(nh31Jqr).subtract(no3Hlj1Jqr);
                     BigDecimal anDan2 = no3Qyc2Jqr.add(nh32Jqr).subtract(no3Hlj2Jqr);
-                    decisionReq.setAnDanOffLxjc(DecimalUtils.getAbsAndScale(anDan1.add(anDan2).divide(DECIMAL_2, INT_2, RoundingMode.HALF_UP), INT_0));
+                    decisionReq.setAnDanOffLxjc(DecimalUtils.getAbsAndScale(anDan1.add(anDan2).divide(DECIMAL_2, INT_2, RoundingMode.HALF_UP), INT_2));
                 }
             }
         }