融合平台使用相机列表

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -91,6 +91,9 @@ public class FdUserCameraController extends BaseController {
         List<CameraVo> list = new ArrayList<>();
         for (String childName : param.getChildNames()) {
             CameraVo vo = userService.findCameraDetailByChildName(getToken(), childName);
+            if(vo == null){
+                continue;
+            }
             vo.setUsedSpace(null);
             vo.setTotalSpace(null);
             list.add(vo);

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -415,11 +415,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
     @Override
     public CameraVo getVoByChildName(String childName) {
-        CameraVo vo = new CameraVo();
+        CameraVo vo = null;
         Camera cameraEntity = this.getByChildName(childName);
         if (cameraEntity != null){
             CameraDetail detailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
             if (detailEntity != null){
+                vo = new CameraVo();
                 vo.setId(cameraEntity.getId());
                 vo.setUserId(detailEntity.getUserId());
                 vo.setActivatedTime(cameraEntity.getActivatedTime());

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -298,8 +298,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public CameraVo findCameraDetailByChildName(String token, String childName) {
-        User userVo = this.getByToken(token);
         CameraVo cameraVo = cameraService.getVoByChildName(childName);
+        if(cameraVo == null){
+            return null;
+        }
+        User userVo = this.getByToken(token);
         if(userVo != null && userVo.getId()!= null){
             User user = this.getById(userVo.getId());
             cameraVo.setNickName(user.getNickName());