相机列表数据

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

@@ -40,4 +40,6 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     boolean updateCameraBalance(Long cameraId, int body, Integer points);
 
     void uploadUserCameraInfo(Long id, String cameraVersion, String appVersion);
+
+    Long getCountByUserId(Long userId, Integer type);
 }

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

@@ -82,6 +82,16 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
+    public Long getCountByUserId(Long userId, Integer type) {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CameraDetail::getUserId,userId);
+        if(type != null){
+            wrapper.eq(CameraDetail::getGoodsId,type);
+        }
+        return this.count(wrapper);
+    }
+
+    @Override
     public Integer deadlineNumber(String username) {
         User user = userService.getByUserName(username);
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();

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

@@ -140,7 +140,13 @@ 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.getCountByCompanyId(user.getCompanyId(),null);
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        Long cameraCount = 0L;
+        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),null);
+        }else {
+            cameraCount = cameraDetailService.getCountByUserId(user.getId(),null);
+        }
         Long incrementNum = userIncrementService.getCountByUserId(user.getId(),0);
         Long incrementBindNum = userIncrementService.getCountByUserId(user.getId(),1);
         userVo.setCameraCount(cameraCount);