From 01830e44921b187b448d8cce9c9a46b9ad55af43 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 19:48:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bingx' into bingx
---
src/main/java/project/web/api/UserWalletAddressController.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/src/main/java/project/web/api/UserWalletAddressController.java b/src/main/java/project/web/api/UserWalletAddressController.java
index ae5487c..dc5de67 100644
--- a/src/main/java/project/web/api/UserWalletAddressController.java
+++ b/src/main/java/project/web/api/UserWalletAddressController.java
@@ -9,7 +9,9 @@
import kernel.exception.BusinessException;
import kernel.util.StringUtils;
+import kernel.web.ApplicationUtil;
import kernel.web.Page;
+import kernel.web.PagedQueryDao;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,6 +28,7 @@
import project.blockchain.AdminChannelBlockchainService;
import project.user.UserWalletAddress;
import project.user.UserWalletAddressService;
+import project.web.admin.AdminChannelBlockchainController;
import javax.servlet.http.HttpServletRequest;
@@ -45,8 +48,6 @@
private final String action = "/api/user!";
- @Autowired
- private AdminChannelBlockchainService adminChannelBlockchainService;
/**
* 未生成钱包地址的用户
@@ -94,9 +95,9 @@
int pageSize=300;
try {
pageNo=checkAndSetPageNo(pageNoStr);
- page = this.adminChannelBlockchainService.pagedQuery(pageNo, pageSize, name_para, coin_para);
+ page = pagedQuery(pageNo, pageSize, name_para, coin_para);
Map<String, List<Map<String, Object>>> coinMap = getStringListMap();
- List<Map<String, Object>> result = getCoinData(coinMap, coin_para,page);
+ List<Map<String, Object>> result = getCoinData(coinMap, coin_para);
page.setElements(result);
} catch (BusinessException e) {
logger.error(" error ", e);
@@ -123,13 +124,25 @@
@NotNull
private static Map<String, List<Map<String, Object>>> getStringListMap() {
- List<Map<String, Object>> usdtData = new ArrayList<>();
- usdtData.add(createElement("2c948a8280828d5f01808203eacd0004", "usdt", "/qr/c2b42ee106cf408baf7b1ecc877f2dd4.png", "TBA4W8wtt7eZuGUDMBzdpFT4gQTVtznmQY","ERC20"));
- usdtData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdt", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png", "TBA4W8wtt7eZuGUDMBzdpFT4gQTVtznmQY","TRC20"));
+ List<Map<String, Object>> ethData = new ArrayList<>();
+ ethData.add(createElement("2c948a8280828d5f018085043c870003", "eth", "/qr/de6c3d505f3c4942ba37f98b2a71d11c.png", "0x887c3253bC8a1Bf36985F9919CD4D9F98C719a3C","ETH"));
+ List<Map<String, Object>> btcData = new ArrayList<>();
+ btcData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/fc01e395b31a48539f0057142fe6b9f6.png", "19yJBFdSNM4PUD9G9Mi4agzYEVEdpK9KbN","BTC"));
+
+ List<Map<String, Object>> usdtData = new ArrayList<>();
+ usdtData.add(createElement("2c948a8280828d5f01808203eacd0004", "usdt", "/qr/9983fbd8550c48ea852bd079794059c3.png", "0x887c3253bC8a1Bf36985F9919CD4D9F98C719a3C","ERC20"));
+ usdtData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdt", "/qr/737124b2826f46598e7ac7231d9872ba.png", "TESGCY3weZJgqH64NPMTRL5AXCfNKVR4Tw","TRC20"));
+
+ List<Map<String, Object>> usdcData = new ArrayList<>();
+ usdcData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/737124b2826f46598e7ac7231d9872ba.png", "TFms9AcjHNS6DRVn7xc3gTi5xwnvaxgBTP","TRC20"));
+ usdcData.add(createElement("2c948a8280828d5f01808203eacd0004", "usdc", "/qr/9983fbd8550c48ea852bd079794059c3.png", "0x887c3253bC8a1Bf36985F9919CD4D9F98C719a3C","ERC20"));
Map<String, List<Map<String, Object>>> coinMap = new HashMap<>();
+ coinMap.put("eth", ethData);
+ coinMap.put("btc", btcData);
coinMap.put("usdt", usdtData);
+ coinMap.put("usdc", usdcData);
return coinMap;
}
@@ -143,9 +156,10 @@
return element;
}
- private static List<Map<String, Object>> getCoinData(Map<String, List<Map<String, Object>>> coinMap, String coin, Page page) {
+ private static List<Map<String, Object>> getCoinData(Map<String, List<Map<String, Object>>> coinMap, String coin) {
return coinMap.getOrDefault(coin, new ArrayList<>());
}
+
protected int pageNo = 1;
@@ -175,4 +189,25 @@
}
}
+ public Page pagedQuery(int pageNo, int pageSize, String name_para, String coin_para) {
+ PagedQueryDao pagedQueryDao = ApplicationUtil.getBean(PagedQueryDao.class);
+ StringBuffer queryString = new StringBuffer(
+ " SELECT channelblockchain.UUID id,channelblockchain.BLOCKCHAIN_NAME blockchain_name,"
+ + "channelblockchain.IMG img ,channelblockchain.COIN coin, "
+ + " channelblockchain.ADDRESS address ");
+
+ queryString.append(" FROM T_CHANNEL_BLOCKCHAIN channelblockchain WHERE 1 = 1 ");
+ Map<String, Object> parameters = new HashMap<>();
+ if (!StringUtils.isNullOrEmpty(name_para)) {
+ queryString.append(" and channelblockchain.BLOCKCHAIN_NAME like :name ");
+ parameters.put("name", "%" + name_para + "%");
+ }
+ if (!StringUtils.isNullOrEmpty(coin_para)) {
+ queryString.append(" and channelblockchain.COIN like :coin ");
+ parameters.put("coin", "%" + coin_para + "%");
+ }
+ Page page = pagedQueryDao.pagedQuerySQL(pageNo, pageSize, queryString.toString(), parameters);
+ return page;
+ }
+
}
--
Gitblit v1.9.3