|
@@ -14,6 +14,7 @@ import com.fdkankan.ucenter.common.constants.ConstantFilePath;
|
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
|
import com.fdkankan.sensitive.Variable;
|
|
|
+import com.fdkankan.ucenter.common.constants.NacosProperty;
|
|
|
import com.fdkankan.ucenter.constant.LoginConstant;
|
|
|
import com.fdkankan.ucenter.entity.*;
|
|
|
import com.fdkankan.ucenter.mapper.IUserIncrementMapper;
|
|
@@ -71,6 +72,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
ICameraService cameraService;
|
|
|
@Autowired
|
|
|
ICameraSpaceService cameraSpaceService;
|
|
|
+ @Autowired
|
|
|
+ ICameraTypeService cameraTypeService;
|
|
|
|
|
|
private User getByEmail(String email){
|
|
|
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
|
|
@@ -347,7 +350,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if("10".equals(cameraVo.getCameraType()) ){ //深时权益
|
|
|
+ CameraType cameraType = cameraTypeService.getByCameraType(Integer.valueOf(cameraVo.getCameraType()));
|
|
|
+ if(!"aws".equals(NacosProperty.uploadType) && cameraType != null && cameraType.getIsLaser() == 1 ){ //深时权益
|
|
|
cameraVo.setUsedSpace("0");
|
|
|
}
|
|
|
return cameraVo;
|