*）修改重复列表仪表盘返回结果

amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/src/main/java/com/yeejoin/amos/kgd/service/impl/AnalysisResultServiceImpl.java

@@ -123,9 +123,7 @@ public class AnalysisResultServiceImpl extends ServiceImpl<AnalysisResultMapper,
     public JSONObject getFaultRateByDeviceIdAndStatus(String deviceId, String varName) {
         AnalysisResult analysisResult = analysisResultMapper.queryAnalysisResultRate(deviceId, varName);
         JSONObject jsonData = new JSONObject();
-        if (analysisResult.getAnalysisResultRate() == null) {
-            return jsonData;
-        }
+        if (!ValidationUtil.isEmpty(analysisResult) && !ValidationUtil.isEmpty(analysisResult.getAnalysisResultRate())){
             String analysisResultRate = analysisResult.getAnalysisResultRate();
             JSONObject jsonAnalysisResultRate = JSONObject.parseObject(analysisResultRate); // {"正常":0.97,"内圈2":0.01,"滚动体2":0.01,"外圈2":0.0}
             // 转换成{"seriesDate":[0.97,0.01,0.01,0.0],"axisData":["正常","内圈2","滚动体2","外圈2"]}
@@ -137,24 +135,24 @@ public class AnalysisResultServiceImpl extends ServiceImpl<AnalysisResultMapper,
             }
             jsonData.put("seriesData", seriesData);
             jsonData.put("axisData", axisData);
+        }
         return jsonData;
     }
 
     public JSONArray getFaultTypeProportionByDeviceIdAndStatus(String deviceId, String varName){
         AnalysisResult analysisResult = analysisResultMapper.queryAnalysisResultRate(deviceId, varName);
-        if(analysisResult.getAnalysisResultRate() == null){
-            return null;
-        }
+        JSONArray jsonArray = new JSONArray();
+        if (!ValidationUtil.isEmpty(analysisResult) && !ValidationUtil.isEmpty(analysisResult.getAnalysisResultRate())){
             String analysisResultRate = analysisResult.getAnalysisResultRate();
             JSONObject jsonAnalysisResultRate = JSONObject.parseObject(analysisResultRate); // {"正常":0.97,"内圈2":0.01,"滚动体2":0.01,"外圈2":0.0}
             // 转换成[{"name":"正常","value":0.97},{"name":"内圈2","value":0.01},{"name":"滚动体2","value":0.01},{"name":"外圈2","value":0.0}]
-        JSONArray jsonArray = new JSONArray();
             for (String key : jsonAnalysisResultRate.keySet()) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("name", key);
                 jsonObject.put("value", jsonAnalysisResultRate.get(key));
                 jsonArray.add(jsonObject);
             }
+        }
         return jsonArray;
     }
 
@@ -305,17 +303,11 @@ public class AnalysisResultServiceImpl extends ServiceImpl<AnalysisResultMapper,
             AnalysisResult analysisResult = analysisResultList.get(i);
             String data = analysisResult.getData();
             JSONObject jsonData = JSONObject.parseObject(data);
-
-            if (i%2 == 0){
             result.put("value", jsonData.get("幅值(℃)"));
             result.put("name", analysisResult.getVarName());
-            }else {
-                result.put("value1",jsonData.get("幅值(℃)"));
-                result.put("name1", analysisResult.getVarName());
             jsonArray.add(result);
             result = new JSONObject();
         }
-        }
         result.put("records", jsonArray);
         return result;
     }