فهرست منبع

block 查询增加blockNumber查询条件

JiahengHe 2 سال پیش
والد
کامیت
803978cd50
3فایلهای تغییر یافته به همراه9 افزوده شده و 11 حذف شده
  1. 5 0
      src/main/java/modules/tx/block/BlockService.java
  2. 3 0
      src/main/java/modules/tx/block/block.sqlt
  3. 1 11
      src/test/http/tx/BlockTest.http

+ 5 - 0
src/main/java/modules/tx/block/BlockService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import com.google.common.collect.Interners;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.Kv;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.Record;
 import common.model.Block;
 import common.model.Block;
@@ -20,6 +21,10 @@ public class BlockService {
 
 
     public List<Record> findByChainId(int chainId, MyPaginate p, JSONObject conditionMap) throws Exception {
     public List<Record> findByChainId(int chainId, MyPaginate p, JSONObject conditionMap) throws Exception {
         Kv query = Kv.of("chainId", chainId);
         Kv query = Kv.of("chainId", chainId);
+
+        if (conditionMap != null && !StrKit.isBlank(conditionMap.getString("blockNumber"))){
+            query.set("blockNumber", conditionMap.getString("blockNumber"));
+        }
         if(p != null){
         if(p != null){
             query.set("limit0", (p.getPageNumber() - 1) * p.getPageSize())
             query.set("limit0", (p.getPageNumber() - 1) * p.getPageSize())
                     .set("limit1", p.getPageSize());
                     .set("limit1", p.getPageSize());

+ 3 - 0
src/main/java/modules/tx/block/block.sqlt

@@ -8,6 +8,9 @@
     FROM
     FROM
     	t_block b
     	t_block b
     where b.chainId = #(chainId)
     where b.chainId = #(chainId)
+    #if (blockNumber)
+       and b.blockNumber = #(blockNumber)
+    #end
     order by b.blockNumber desc
     order by b.blockNumber desc
     #if (limit0 && limit1)
     #if (limit0 && limit1)
     	limit #para(limit0), #para(limit1)
     	limit #para(limit0), #para(limit1)

+ 1 - 11
src/test/http/tx/BlockTest.http

@@ -21,17 +21,7 @@ Content-Type: application/json
 {
 {
   "chainId": 56,
   "chainId": 56,
   "conditions": {
   "conditions": {
-    "tx": {
-      "block": "",
-      "hash": "",
-      "from": "",
-      "to": ""
-    },
-    "transfer": {
-      "from": "",
-      "to": "",
-      "token": ""
-    }
+      "blockNumber": "27027720"
   },
   },
   "pageNumber": 1,
   "pageNumber": 1,
   "pageSize": 200,
   "pageSize": 200,