bug 配套设备库：修改序列号

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -357,33 +357,37 @@ public class DeviceCheckController {
                 .map(transUtil::CheckDetailDo2Vo)
                 .orElse(null);
 
-        Map<Integer, List<DeviceInLibVo>> in = confirmCheckTask.hisInLib.get(id).stream().collect(groupingBy(DeviceInLibVo::getId));
+        List<DeviceInLibVo> mapTemp = confirmCheckTask.hisInLib.get(id);
 
-        List<DeviceInLibVo> devInLibrary = detailVoList.getDevInLibrary();
+        if (mapTemp != null) {
+            Map<Integer, List<DeviceInLibVo>> in = mapTemp.stream().collect(groupingBy(DeviceInLibVo::getId));
 
-        List<DeviceInLibVo> ins = new ArrayList<>();
-        for (DeviceInLibVo deviceInLibVo : devInLibrary) {
-            List<DeviceInLibVo> deviceInLibVos = in.get(deviceInLibVo.getId());
-            if (deviceInLibVos !=null && deviceInLibVos.size() ==1 ) {
-                DeviceInLibVo o = deviceInLibVos.get(0);
-                o.setProofResult(deviceInLibVo.getProofResult());
-                ins.add(o);
-            } else {
-                ins.add(deviceInLibVo);
+            List<DeviceInLibVo> devInLibrary = detailVoList.getDevInLibrary();
+
+            List<DeviceInLibVo> ins = new ArrayList<>();
+            for (DeviceInLibVo deviceInLibVo : devInLibrary) {
+                List<DeviceInLibVo> deviceInLibVos = in.get(deviceInLibVo.getId());
+                if (deviceInLibVos != null && deviceInLibVos.size() == 1) {
+                    DeviceInLibVo o = deviceInLibVos.get(0);
+                    o.setProofResult(deviceInLibVo.getProofResult());
+                    ins.add(o);
+                } else {
+                    ins.add(deviceInLibVo);
+                }
             }
-        }
 
-        List<DeviceNotInLibVo> notIn = confirmCheckTask.hisNotInLib.get(id);
-        if (notIn != null) {
-            detailVoList.setDevNotInLibrary(notIn);
-        }
+            List<DeviceNotInLibVo> notIn = confirmCheckTask.hisNotInLib.get(id);
+            if (notIn != null) {
+                detailVoList.setDevNotInLibrary(notIn);
+            }
 
-        if (in == null && notIn==null) {
-            // 理论上不会走到这一步
-            long secondTime = System.currentTimeMillis();
-            CheckDetailVo checkDetailVo = historyCheckDeviceService.replayHistoryDevice(detailVoList, id);
-            log.info("[check] 查询快照的时间:{}", System.currentTimeMillis() - secondTime);
-            return ResponseEntity.ok(new ResultObj<>(checkDetailVo));
+            if (in == null && notIn == null) {
+                // 理论上不会走到这一步
+                long secondTime = System.currentTimeMillis();
+                CheckDetailVo checkDetailVo = historyCheckDeviceService.replayHistoryDevice(detailVoList, id);
+                log.info("[check] 查询快照的时间:{}", System.currentTimeMillis() - secondTime);
+                return ResponseEntity.ok(new ResultObj<>(checkDetailVo));
+            }
         }
 
         return ResponseEntity.ok(new ResultObj<>(detailVoList));