|
@@ -116,7 +116,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
|
|
sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2); //封存场景
|
|
sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2); //封存场景
|
|
}
|
|
}
|
|
if(cameraDetail.getType() == 10){
|
|
if(cameraDetail.getType() == 10){
|
|
- fdkkLaserService.toBind(cameraMap.get(cameraDetail.getCameraId()).getSnCode(),null,null);
|
|
|
|
|
|
+ fdkkLaserService.toBind(false,cameraMap.get(cameraDetail.getCameraId()).getSnCode(),null,null);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//恢复10G基本容量
|
|
//恢复10G基本容量
|
|
@@ -140,7 +140,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
|
|
HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
|
|
HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
|
|
for (CameraDetail cameraDetail : detailMap.values()) {
|
|
for (CameraDetail cameraDetail : detailMap.values()) {
|
|
if(cameraDetail.getType() == 10){
|
|
if(cameraDetail.getType() == 10){
|
|
- fdkkLaserService.toBind(cameraMap.get(cameraDetail.getCameraId()).getSnCode(),user.getUserName(),user.getId());
|
|
|
|
|
|
+ fdkkLaserService.toBind(true,cameraMap.get(cameraDetail.getCameraId()).getSnCode(),user.getUserName(),user.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|