|
50 | 50 | import com.cloud.utils.exception.CloudRuntimeException; |
51 | 51 | import org.apache.cloudstack.api.ApiErrorCode; |
52 | 52 | import org.apache.cloudstack.api.ServerApiException; |
53 | | -import org.apache.cloudstack.api.command.*; |
| 53 | + |
| 54 | +import org.apache.cloudstack.api.command.QuotaBalanceCmd; |
| 55 | +import org.apache.cloudstack.api.command.QuotaConfigureEmailCmd; |
| 56 | +import org.apache.cloudstack.api.command.QuotaCreditsListCmd; |
| 57 | +import org.apache.cloudstack.api.command.QuotaEmailTemplateListCmd; |
| 58 | +import org.apache.cloudstack.api.command.QuotaEmailTemplateUpdateCmd; |
| 59 | +import org.apache.cloudstack.api.command.QuotaPresetVariablesListCmd; |
| 60 | +import org.apache.cloudstack.api.command.QuotaStatementCmd; |
| 61 | +import org.apache.cloudstack.api.command.QuotaSummaryCmd; |
| 62 | +import org.apache.cloudstack.api.command.QuotaTariffCreateCmd; |
| 63 | +import org.apache.cloudstack.api.command.QuotaTariffListCmd; |
| 64 | +import org.apache.cloudstack.api.command.QuotaTariffUpdateCmd; |
| 65 | +import org.apache.cloudstack.api.command.QuotaValidateActivationRuleCmd; |
54 | 66 | import org.apache.cloudstack.context.CallContext; |
55 | 67 | import org.apache.cloudstack.discovery.ApiDiscoveryService; |
56 | 68 | import org.apache.cloudstack.jsinterpreter.JsInterpreterHelper; |
|
65 | 77 | import org.apache.cloudstack.quota.activationrule.presetvariables.Value; |
66 | 78 | import org.apache.cloudstack.quota.constant.QuotaConfig; |
67 | 79 | import org.apache.cloudstack.quota.constant.QuotaTypes; |
68 | | -import org.apache.cloudstack.quota.dao.*; |
69 | | -import org.apache.cloudstack.quota.vo.*; |
| 80 | + |
| 81 | +import org.apache.cloudstack.quota.dao.QuotaAccountDao; |
| 82 | +import org.apache.cloudstack.quota.dao.QuotaBalanceDao; |
| 83 | +import org.apache.cloudstack.quota.dao.QuotaCreditsDao; |
| 84 | +import org.apache.cloudstack.quota.dao.QuotaEmailConfigurationDao; |
| 85 | +import org.apache.cloudstack.quota.dao.QuotaEmailTemplatesDao; |
| 86 | +import org.apache.cloudstack.quota.dao.QuotaSummaryDao; |
| 87 | +import org.apache.cloudstack.quota.dao.QuotaTariffDao; |
| 88 | +import org.apache.cloudstack.quota.dao.QuotaUsageDao; |
| 89 | +import org.apache.cloudstack.quota.vo.QuotaAccountVO; |
| 90 | +import org.apache.cloudstack.quota.vo.QuotaBalanceVO; |
| 91 | +import org.apache.cloudstack.quota.vo.QuotaCreditsVO; |
| 92 | +import org.apache.cloudstack.quota.vo.QuotaEmailConfigurationVO; |
| 93 | +import org.apache.cloudstack.quota.vo.QuotaEmailTemplatesVO; |
| 94 | +import org.apache.cloudstack.quota.vo.QuotaSummaryVO; |
| 95 | +import org.apache.cloudstack.quota.vo.QuotaTariffVO; |
| 96 | +import org.apache.cloudstack.quota.vo.QuotaUsageVO; |
70 | 97 | import org.apache.cloudstack.utils.jsinterpreter.JsInterpreter; |
71 | 98 | import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils; |
72 | 99 | import org.apache.commons.collections4.CollectionUtils; |
@@ -330,14 +357,14 @@ protected QuotaSummaryResponse getQuotaSummaryResponse(final Account account) { |
330 | 357 |
|
331 | 358 | if (account != null) { |
332 | 359 | QuotaSummaryResponse qr = new QuotaSummaryResponse(); |
333 | | - DomainVO domain = _domainDao.findById(account.getDomainId()); |
| 360 | + DomainVO domain = domainDao.findById(account.getDomainId()); |
334 | 361 | BigDecimal curBalance = _quotaBalanceDao.lastQuotaBalance(account.getAccountId(), account.getDomainId(), period[1].getTime()); |
335 | 362 | BigDecimal quotaUsage = quotaUsageDao.findTotalQuotaUsage(account.getAccountId(), account.getDomainId(), null, period[0].getTime(), period[1].getTime()); |
336 | 363 |
|
337 | 364 | qr.setAccountId(account.getUuid()); |
338 | 365 | qr.setAccountName(account.getAccountName()); |
339 | 366 | qr.setDomainId(domain.getUuid()); |
340 | | - qr.setDomainName(domain.getName()); |
| 367 | + qr.setDomainPath(domain.getName()); |
341 | 368 | qr.setBalance(curBalance); |
342 | 369 | qr.setQuotaUsage(quotaUsage); |
343 | 370 | qr.setState(account.getState()); |
|
0 commit comments