21362

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java

@@ -105,8 +105,14 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
                 || 0 > (Integer.valueOf(String.valueOf(alarmEquipDayLink.get("sumNum"))) - Integer.valueOf(String.valueOf(alarmEquipDayLink.get("hbSumNum"))))) {
             alarmEquipDayLink.put("hbRate", bigDecimal + "%");
         } else {
-            BigDecimal rate = nowDaySum.subtract(lastDaySum).divide(lastDaySum, 2, BigDecimal.ROUND_HALF_UP);
-            alarmEquipDayLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
+            BigDecimal rate = nowDaySum.subtract(lastDaySum).divide(lastDaySum, 4, BigDecimal.ROUND_HALF_UP);
+            if("0.0000".equals(String.valueOf(rate))) {
+                alarmEquipDayLink.put("hbRate", "0%");
+            } else {
+                BigDecimal rateNew = rate.multiply(new BigDecimal("100"));
+                BigDecimal bigDecimal1 = rateNew.setScale(2, BigDecimal.ROUND_HALF_UP);
+                alarmEquipDayLink.put("hbRate", bigDecimal1 + "%");
+            }
         }
 
         //  获取今日告警设备、月环比