فهرست منبع

t_token,新增两个接口:
1. makeMagicApprolval(string)
此接口可以标记token的审批状态(枚举:PASS、PENDING、REJECT)
2. findApprovalTokenByChainId(int)
token的审批状态(magicApproval)通常是null的,这个接口就是将magicApproval字段不为null的token全部查出(通常不会太多,可以不用做分页)

JiahengHe 2 سال پیش
والد
کامیت
6285b2aea7

+ 25 - 0
src/main/java/common/model/base/BaseToken.java

@@ -84,6 +84,31 @@ public abstract class BaseToken<M extends BaseToken<M>> extends Model<M> impleme
 	public java.lang.String getLevel() {
 		return getStr("level");
 	}
+
+	public void setMagicApproval(java.lang.String  magicApproval) {
+		set("magicApproval", magicApproval);
+	}
+
+	public java.lang.String getMagicApproval() {
+		return getStr("magicApproval");
+	}
+
+	public void setMaxHoldLp(java.lang.String maxHoldLp) {
+		set("maxHoldLp", maxHoldLp);
+	}
+
+	public java.lang.String getMaxHoldLp() {
+		return getStr("maxHoldLp");
+	}
+
+	public void setFee(java.lang.Long fee) {
+		set("fee", fee);
+	}
+
+	public java.lang.Long getFee() {
+		return getLong("fee");
+	}
+
 	public void setAppendTimestamp(java.lang.Long appendTimestamp) {
 		set("appendTimestamp", appendTimestamp);
 	}

+ 21 - 0
src/main/java/modules/address/token/TokenController.java

@@ -105,4 +105,25 @@ public class TokenController extends MyController {
 		renderJson(MyRet.ok("delete Token successful.").setData(service.deleteByHashAndChainId(token.getChainId(), token.getHash())));
 	}
 
+	@EmptyInterface(keyArray = {"chainId", "hash", "magicApprolval"})
+	public void makeMagicApprolval(){
+		String requestJson = (String) getRequest().getAttribute("data");
+		JSONObject requestJsonObj = JSONObject.parseObject(requestJson);
+		int chainId = requestJsonObj.getInteger("chainId");
+		String hash = requestJsonObj.getString("hash");
+		String magicApprolval = requestJsonObj.getString("magicApprolval");
+		int num = service.setMagicApprolval(magicApprolval, chainId, hash);
+		renderJson(MyRet.ok("set successful.").setData(num));
+	}
+
+	@EmptyInterface(keyArray = {"chainId"})
+	public void findApprovalTokenByChainId(){
+		String requestJson = (String) getRequest().getAttribute("data");
+		JSONObject requestJsonObj = JSONObject.parseObject(requestJson);
+		int chainId = requestJsonObj.getInteger("chainId");
+
+		List<Record> rstList = service.findApprovalTokenByChainId(chainId);
+		renderJson(MyRet.ok("ApprovalTokens is found.").setData(rstList));
+	}
+
 }

+ 8 - 0
src/main/java/modules/address/token/TokenService.java

@@ -72,4 +72,12 @@ public class TokenService {
 	public int deleteByHashAndChainId(int chainId, String hash){
 		return addressService.deleteByHashAndChainId("t_token", chainId, hash);
 	}
+
+	public int setMagicApprolval(String magicApprolval, int chainId, String hash){
+		return Db.template("token.setMagicApprolval", magicApprolval, chainId, hash).update();
+	}
+
+	public List<Record> findApprovalTokenByChainId(int chainId){
+		return Db.template("token.findApprovalTokenByChainId", chainId).find();
+	}
 }

+ 18 - 0
src/main/java/modules/address/token/token.sqlt

@@ -3,4 +3,22 @@
 select symbol, decimals
 from t_token
 where chainId=#para(0) and hash=#para(1)
+#end
+
+#sql("setMagicApprolval")
+UPDATE t_token
+SET magicApproval = #para(0)
+WHERE
+	chainId = #para(1)
+	AND `hash` = #para(2)
+#end
+
+#sql("findApprovalTokenByChainId")
+    SELECT
+    	*
+    FROM
+    	t_token
+    WHERE
+    	chainId = #para(0)
+    	AND magicApproval in ('PASS', 'PENDING' , 'REJECT')
 #end

+ 26 - 0
src/test/http/address/TokenTest.http

@@ -87,4 +87,30 @@ Content-Type: application/json
     "auth": "9d8b7074bf189dcad17189c8f264c0cb",
     "timestamp": "123123"
   }
+}
+
+###
+POST {{ baseUrl }}/token/makeMagicApprolval
+Content-Type: application/json
+
+{
+  "chainId": 1,
+  "hash": "0x8A9009847570FdbCc676c7fD547aB26A358a5005",
+  "magicApprolval": "PASS",
+  "auth": {
+    "auth": "9d8b7074bf189dcad17189c8f264c0cb",
+    "timestamp": "123123"
+  }
+}
+
+###
+POST {{ baseUrl }}/token/findApprovalTokenByChainId
+Content-Type: application/json
+
+{
+  "chainId": 1,
+  "auth": {
+    "auth": "9d8b7074bf189dcad17189c8f264c0cb",
+    "timestamp": "123123"
+  }
 }