新增摄像头，立即更新可捕捉的画面

smartcity-facilities/src/main/java/com/zcxk/facilities/service/impl/CameraServiceImpl.java

@@ -178,19 +178,18 @@ public class CameraServiceImpl implements CameraService {
         //cameraMapper.unbindCameraRelations(cameraDTO.getPointId(),null);
         List<Camera>saveCameras=new ArrayList<>();
         cameras.forEach(cameraInfo -> {
-            Camera camera=new Camera();
-            BeanUtils.copyProperties(cameraDTO.getVideoRecorderDTO(),camera);
-            BeanUtils.copyProperties(cameraInfo,camera);
-            camera.setSiteId(siteId);
-            camera.setCreateBy(username);
-            camera.setDateCreate(new Date());
-            camera.setMonitorPointId(cameraDTO.getPointId());
-            camera.setMonitorSceneId(cameraDTO.getSenceId());
-            camera.setStatus(1);
-            camera.setVideoStatus(1);
-            camera.setCameraStatus(cameraInfo.getStatus()
-            );
-            saveCameras.add(camera);
+                    Camera camera = new Camera();
+                    BeanUtils.copyProperties(cameraDTO.getVideoRecorderDTO(), camera);
+                    BeanUtils.copyProperties(cameraInfo, camera);
+                    camera.setSiteId(siteId);
+                    camera.setCreateBy(username);
+                    camera.setDateCreate(new Date());
+                    camera.setMonitorPointId(cameraDTO.getPointId());
+                    camera.setMonitorSceneId(cameraDTO.getSenceId());
+                    camera.setStatus(1);
+                    camera.setCameraStatus(1);
+                    camera.setVideoStatus(1);
+                    saveCameras.add(camera);
         });
         syncChannelName(saveCameras);
         cameraDTO.setSaveCameras(saveCameras);
@@ -434,9 +433,24 @@ public class CameraServiceImpl implements CameraService {
             if(picUrl!=null){
                 Camera updateCamera=new Camera();
                 updateCamera.setId(camera.getId());
+                if(updateCamera.getId()==null){
+                    Camera queryCamera=new Camera();
+                    queryCamera.setMonitorSceneId(camera.getMonitorSceneId());
+                    queryCamera.setMonitorPointId(camera.getMonitorPointId());
+                    queryCamera.setDeviceSerial(camera.getDeviceSerial());
+                    queryCamera.setChannelNo(camera.getChannelNo());
+                    List<Camera> cameras = cameraMapper.selectList(queryCamera);
+                    if(cameras.size()>0){
+                        updateCamera.setId(cameras.get(0).getId());
+                    }
+
+                }
                 updateCamera.setPicUrl(picUrl);
                 updateCamera.setDateUpdate(new Date());
-                cameraMapper.update(updateCamera);
+                if(updateCamera.getId()!=null){
+                    cameraMapper.update(updateCamera);
+                }
+
             }