接口

src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -53,16 +53,29 @@ public class ShowDataController {
             Response response = new Response();
             // 诊断信息
             ResultInfo resultInfo = resultInfoService.getOne(new QueryWrapper<ResultInfo>().eq("sn", param.getSn()));
-            resultInfo.setSafety(resultInfo.getSafety().replace("；", ";"));
-            resultInfo.setSafetyAdvice(resultInfo.getSafetyAdvice().replace("；", ";"));
-            resultInfo.setPerform(resultInfo.getPerform().replace("；", ";"));
-            resultInfo.setPerformAdvice(resultInfo.getPerformAdvice().replace("；", ";"));
+            if (resultInfo.getSafety() != null) {
+                resultInfo.setSafety(resultInfo.getSafety().replace("；", ";"));
+                response.setSafety(Arrays.asList(resultInfo.getSafety().split(";")));
+            }
+            if (resultInfo.getSafetyAdvice() != null) {
+                resultInfo.setSafetyAdvice(resultInfo.getSafetyAdvice().replace("；", ";"));
+                response.setSafetyAdvice(Arrays.asList(resultInfo.getSafetyAdvice().split(";")));
+            }
+            if (resultInfo.getPerform() != null) {
+                resultInfo.setPerform(resultInfo.getPerform().replace("；", ";"));
+                response.setPerform(Arrays.asList(resultInfo.getPerform().split(";")));
+            }
+            if (resultInfo.getPerformAdvice() != null) {
+                resultInfo.setPerformAdvice(resultInfo.getPerformAdvice().replace("；", ";"));
+                response.setPerformAdvice(Arrays.asList(resultInfo.getPerformAdvice().split(";")));
+            }
+
+
+
 
-            response.setSafety(Arrays.asList(resultInfo.getSafety().split(";")));
-            response.setSafetyAdvice(Arrays.asList(resultInfo.getSafetyAdvice().split(";")));
             response.setRiskNotation(resultInfo.getRiskNotation());
-            response.setPerform(Arrays.asList(resultInfo.getPerform().split(";")));
-            response.setPerformAdvice(Arrays.asList(resultInfo.getPerformAdvice().split(";")));
+
+
             if (param.getTableId().equals(1)) {
                 response.setScore(resultInfo.getScore());
                 response.setSoh(resultInfo.getSoh());
@@ -90,8 +103,8 @@ public class ShowDataController {
             List<ResultInnershort> resultInnershorts = resultInnershortService.list(new QueryWrapper<ResultInnershort>().eq("sn", param.getSn()));
             List<String> innerShortDate = new ArrayList<>();
             Map<String, Object> innerShortData = new HashMap<>();
-            List<List<Float>> innerShortDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),
-                    new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>());
+            List<List<Float>> innerShortDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(),
+                    new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             for (ResultInnershort r : resultInnershorts) {
                 innerShortDate.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(r.getTime()));
                 innerShortDatas.get(0).add(r.getCell1());
@@ -115,8 +128,8 @@ public class ShowDataController {
             List<ResultVoltOutlier> resultVoltOutliers = resultVoltOutlierService.list(new QueryWrapper<ResultVoltOutlier>().eq("sn", param.getSn()));
             List<String> voltOutlierDate = new ArrayList<>();
             Map<String, Object> voltOutlierData = new HashMap<>();
-            List<List<Float>> voltOutlierDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),
-                    new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>());
+            List<List<Float>> voltOutlierDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(),
+                    new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             for (ResultVoltOutlier r : resultVoltOutliers) {
                 voltOutlierDate.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(r.getTime()));
                 voltOutlierDatas.get(0).add(r.getCell1());
@@ -140,8 +153,8 @@ public class ShowDataController {
             List<ResultVoltdiffOutlier> resultVoltdiffOutliers = resultVoltdiffOutlierService.list(new QueryWrapper<ResultVoltdiffOutlier>().eq("sn", param.getSn()));
             List<String> voltdiffOutlierDate = new ArrayList<>();
             Map<String, Object> voltdiffOutlierData = new HashMap<>();
-            List<List<Float>> voltdiffOutlierDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),
-                    new ArrayList<>(),new ArrayList<>(),new ArrayList<>(),new ArrayList<>());
+            List<List<Float>> voltdiffOutlierDatas = Arrays.asList(new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(),
+                    new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             for (ResultVoltdiffOutlier r : resultVoltdiffOutliers) {
                 voltdiffOutlierDate.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(r.getTime()));
                 voltdiffOutlierDatas.get(0).add(r.getCell1());