1

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -393,7 +393,6 @@ public class SceneApiController extends BaseController {
 
     /**
      * 场景浏览
-     * @param scene
      * @return
      */
     @RequestMapping(value = "/loadAllScene", method = RequestMethod.POST)

src/main/java/com/fdkankan/ucenter/service/ICameraDetailService.java

@@ -34,6 +34,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     void addUsedSpace(HashMap<Long, Long> cameraMap);
 
     List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType);
+
     List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType);
 
     boolean updateCameraBalance(Long cameraId, int body, Integer points);

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

@@ -48,7 +48,15 @@ public class AppCameraService {
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
-        return cameraDetailService.getListByUserAndType(user.getId(),cameraType);
+        List<CameraAppVo> cameraAppVoList = cameraDetailService.getListByUserAndType(user.getId(), cameraType);
+        for (CameraAppVo cameraApp : cameraAppVoList) {
+            UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getId());
+            if(userIncrementEntity != null){
+                cameraApp.setUserIncrementId(userIncrementEntity.getId());
+                cameraApp.setIsExpire(userIncrementEntity.getIsExpired());
+            }
+        }
+        return cameraAppVoList;
     }
 
     public CameraAppVo bindCamera(String userName, String snCode) {