Skip to content

判断JSONARRAY为空问题 #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shonve wants to merge 1 commit into
base: master
Choose a base branch
from
Open

判断JSONARRAY为空问题 #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 16 additions & 40 deletions src/main/java/com/huobi/service/huobi/HuobiAccountService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,25 @@
package com.huobi.service.huobi;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

import com.huobi.client.AccountClient;
import com.huobi.client.req.account.AccountAssetValuationRequest;
import com.huobi.client.req.account.AccountBalanceRequest;
import com.huobi.client.req.account.AccountFuturesTransferRequest;
import com.huobi.client.req.account.AccountHistoryRequest;
import com.huobi.client.req.account.AccountLedgerRequest;
import com.huobi.client.req.account.AccountTransferRequest;
import com.huobi.client.req.account.PointRequest;
import com.huobi.client.req.account.PointTransferRequest;
import com.huobi.client.req.account.SubAccountUpdateRequest;
import com.huobi.client.req.account.*;
import com.huobi.constant.Options;
import com.huobi.constant.WebSocketConstants;
import com.huobi.constant.enums.AccountTypeEnum;
import com.huobi.model.account.Account;
import com.huobi.model.account.AccountAssetValuationResult;
import com.huobi.model.account.AccountBalance;
import com.huobi.model.account.AccountFuturesTransferResult;
import com.huobi.model.account.AccountHistory;
import com.huobi.model.account.AccountLedgerResult;
import com.huobi.model.account.AccountTransferResult;
import com.huobi.model.account.AccountUpdateEvent;
import com.huobi.model.account.Point;
import com.huobi.model.account.PointTransferResult;
import com.huobi.model.account.*;
import com.huobi.service.huobi.connection.HuobiRestConnection;
import com.huobi.service.huobi.connection.HuobiWebSocketConnection;
import com.huobi.service.huobi.parser.account.AccountAssetValuationResultParser;
import com.huobi.service.huobi.parser.account.AccountBalanceParser;
import com.huobi.service.huobi.parser.account.AccountFuturesTransferResultParser;
import com.huobi.service.huobi.parser.account.AccountHistoryParser;
import com.huobi.service.huobi.parser.account.AccountLedgerParser;
import com.huobi.service.huobi.parser.account.AccountParser;
import com.huobi.service.huobi.parser.account.AccountTransferResultParser;
import com.huobi.service.huobi.parser.account.AccountUpdateEventParser;
import com.huobi.service.huobi.parser.account.PointParser;
import com.huobi.service.huobi.parser.account.PointTransferResultParser;
import com.huobi.service.huobi.parser.account.*;
import com.huobi.service.huobi.signature.UrlParamsBuilder;
import com.huobi.utils.InputChecker;
import com.huobi.utils.ResponseCallback;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

public class HuobiAccountService implements AccountClient {

public static final String GET_ACCOUNTS_PATH = "/v1/account/accounts";
Expand Down Expand Up @@ -113,13 +86,16 @@ public List<AccountHistory> getAccountHistory(AccountHistoryRequest request) {

JSONObject jsonObject = restConnection.executeGetWithSignature(GET_ACCOUNT_HISTORY_PATH, builder);
JSONArray jsonArray = jsonObject.getJSONArray("data");
AccountHistoryParser parser = new AccountHistoryParser();

List<AccountHistory> list = new ArrayList<>(jsonArray.size());
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonItem = jsonArray.getJSONObject(i);
list.add(parser.parse(jsonItem));
if(!jsonArray.isEmpty()) {
AccountHistoryParser parser = new AccountHistoryParser();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonItem = jsonArray.getJSONObject(i);
list.add(parser.parse(jsonItem));
}
list.get(list.size() - 1).setNextId(jsonObject.getLong("next-id"));
}
list.get(list.size()-1).setNextId(jsonObject.getLong("next-id"));
return list;
}

Expand Down