21

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

@@ -19,7 +19,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     CameraDetail getByCameraId(Long cameraId);
 
-    Long getCountByUserId(Long userId);
+    Long getCountByUserId(Long userId,Integer type);
 
     Integer deadlineNumber(String username);
 

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

@@ -69,7 +69,7 @@ public class AppService {
 
 
     private LoginVo commonLogin(User user,LoginParam param,String token){
-        Long count = cameraDetailService.getCountByUserId(user.getId());
+        Long count = cameraDetailService.getCountByUserId(user.getId(),null);
         if(param.getCameraType() == null){
             param.setCameraType(  4);
         }

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

@@ -38,7 +38,7 @@ public class AppUserService {
         }
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(user,userVo);
-        Long cameraCount = cameraDetailService.getCountByUserId(user.getId());
+        Long cameraCount = cameraDetailService.getCountByUserId(user.getId(),cameraType);
         Long proCount = sceneProService.getCountByUserId(user.getId(), cameraType);
         Long plusCount = scenePlusService.getCountByUserId(user.getId(), cameraType);
         Long expansionCount = expansionOrderService.getCount(user.getId(),cameraType);

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

@@ -71,9 +71,12 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public Long getCountByUserId(Long userId) {
+    public Long getCountByUserId(Long userId,Integer type) {
         LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CameraDetail::getUserId,userId);
+        if(type != null){
+            wrapper.eq(CameraDetail::getType,type);
+        }
         return this.count(wrapper);
     }
 

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

@@ -120,7 +120,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         User user = this.getByUserName(userName);
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(user,userVo);
-        Long cameraCount = cameraDetailService.getCountByUserId(user.getId());
+        Long cameraCount = cameraDetailService.getCountByUserId(user.getId(),null);
         Long incrementNum = userIncrementService.getCountByUserId(user.getId(),0);
         Long incrementBindNum = userIncrementService.getCountByUserId(user.getId(),1);
         userVo.setCameraCount(cameraCount);