预警详情保留一位小数

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/AlarmInfoDetailServiceImpl.java

@@ -212,11 +212,11 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
             HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
             FanHealthIndex idxBizFanHealthIndex = idxBizFanHealthIndexList.get(i);
             xDatas.add(idxBizFanHealthIndex.getAnalysisTime());
-            yDatas.add(idxBizFanHealthIndex.getHealthIndex());
+            yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex())));
             alarmAbnormalityItem.put("sort", String.valueOf(i));
             alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getAnalysisTime());
-            alarmAbnormalityItem.put("abnormal", String.valueOf(idxBizFanHealthIndex.getAnomaly()).replace("null","0.0"));
-            alarmAbnormalityItem.put("healthValue", String.valueOf(idxBizFanHealthIndex.getHealthIndex()));
+            alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getAnomaly()));
+            alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex()));
             alarmAbnormalityList.add(alarmAbnormalityItem);
         }
         alarmTrendMap.put("xDatas", xDatas);
@@ -265,11 +265,11 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
             HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
             PvHealthIndex idxBizPvHealthIndex = idxBizPvHealthIndexList.get(i);
             xDatas.add(idxBizPvHealthIndex.getAnalysisTime());
-            yDatas.add(idxBizPvHealthIndex.getHealthIndex());
+            yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex())));
             alarmAbnormalityItem.put("sort", String.valueOf(i));
             alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getAnalysisTime());
-            alarmAbnormalityItem.put("abnormal", String.valueOf(idxBizPvHealthIndex.getAnomaly()).replace("null","0.0"));
-            alarmAbnormalityItem.put("healthValue", String.valueOf(idxBizPvHealthIndex.getHealthIndex()));
+            alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getAnomaly()));
+            alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex()));
             if (idxBizPvHealthIndexListSize >= 3) {
                 if (i == 0) {
                     endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5);
@@ -540,10 +540,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
-                    currentValueMap.put("analyseValue", String.valueOf(analyseValue));
-                    currentValueMap.put("processValue1", String.valueOf(processValue1));
-                    currentValueMap.put("processValue2", String.valueOf(processValue2));
-                    currentValueMap.put("processValue3", String.valueOf(processValue3));
+                    currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalFan(processValue1, processValue2, processValue3, idxBizFanPointVarCentralValueList);
                     trainValueMap.put("time", s);
                     currentValue.add(currentValueMap);
@@ -599,10 +599,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
-                    currentValueMap.put("analyseValue", String.valueOf(analyseValue));
-                    currentValueMap.put("processValue1", String.valueOf(processValue1));
-                    currentValueMap.put("processValue2", String.valueOf(processValue2));
-                    currentValueMap.put("processValue3", String.valueOf(processValue3));
+                    currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalPv(processValue1, processValue2, processValue3, idxBizPvPointVarCentralValueList);
                     trainValueMap.put("time", s);
                     currentValue.add(currentValueMap);
@@ -653,4 +653,17 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         result.put("warningCycle",warningCycle);
         return result;
     }
+
+    /**
+     * 保留一位小数
+     * @param input
+     * @return
+     */
+    public String keepOneKeepDecimalPlace(Double input){
+        String result = "0.0";
+        if(!ObjectUtils.isEmpty(input)){
+            return String.format("%.1f",input) ;
+        }
+        return  result;
+    }
 }