debug

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

@@ -56,50 +56,65 @@ public class ShowDataController {
         try {
             log.info(param.getSn() + "正在获取右侧数据");
             Response response = new Response();
+            ResultInfo resultInfo = new ResultInfo();
             // 诊断信息
-            ResultInfo resultInfo = resultInfoService.getOne(new QueryWrapper<ResultInfo>().eq("sn", param.getSn()));
-            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.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.setReason(resultInfo.getReason());
-            response.setAlarmCell(resultInfo.getLocation());
+            resultInfo = resultInfoService.getOne(new QueryWrapper<ResultInfo>().eq("sn", param.getSn()));
+            if (resultInfo != null) {
+                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(";")));
+                }
 
-            response.setRiskNotation(resultInfo.getRiskNotation());
+                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.setReason(resultInfo.getReason());
+                response.setAlarmCell(resultInfo.getLocation());
 
-            if (param.getTableId().equals(1)) {
+                response.setRiskNotation(resultInfo.getRiskNotation());
                 if (resultInfo.getAlarmTime() != null) {
                     response.setAlarmTime(new SimpleDateFormat("yyyy-MM-dd").format(resultInfo.getAlarmTime()));
-                }
-            }
 
-            if (param.getTableId().equals(2)) {
+                }
                 response.setScore(resultInfo.getScore());
                 response.setSoh(resultInfo.getSoh());
                 response.setCapUniform(resultInfo.getCapUniform());
                 response.setSocUniform(resultInfo.getSocUniform());
                 response.setInnershortIndex(resultInfo.getInnershortIndex());
                 response.setSohUniform(resultInfo.getSohUniform());
+
             }
 
+
+
+//            if (param.getTableId().equals(1)) {
+//                if (resultInfo.getAlarmTime() != null) {
+//                    response.setAlarmTime(new SimpleDateFormat("yyyy-MM-dd").format(resultInfo.getAlarmTime()));
+//                }
+//            }
+//
+//            if (param.getTableId().equals(2)) {
+//                response.setScore(resultInfo.getScore());
+//                response.setSoh(resultInfo.getSoh());
+//                response.setCapUniform(resultInfo.getCapUniform());
+//                response.setSocUniform(resultInfo.getSocUniform());
+//                response.setInnershortIndex(resultInfo.getInnershortIndex());
+//                response.setSohUniform(resultInfo.getSohUniform());
+//            }
+
             // 当前信息
             ResultOriginData resultOriginData = resultOriginDataService.getOne(new QueryWrapper<ResultOriginData>().eq("device_id", param.getSn()));
             response.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(resultOriginData.getDate()));
@@ -310,4 +325,5 @@ public class ShowDataController {
         resultOriginData.forEach(p -> snList.add(p.getDeviceId()));
         return ApiDTO.ok(snList);
     }
+
 }