Merge remote-tracking branch 'origin/master'

src/main/java/com/ichaoj/ams/response/execute/ExecuteResponse.java

@@ -1,6 +1,7 @@
 package com.ichaoj.ams.response.execute;
 
 import com.ichaoj.ams.response.task.TaskResponse;
+import com.ichaoj.ams.script.model.AirdropParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -92,4 +93,8 @@ public class ExecuteResponse {
      */
     private LocalDateTime updateTime;
 
+    private List<AirdropParam> airdropParams;
+
+    private String paramsStr;
+
 }

src/main/java/com/ichaoj/ams/service/impl/AmsExecuteRecordServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -86,7 +87,13 @@ public class AmsExecuteRecordServiceImpl extends SuperWhaleServiceImpl<AmsExecut
 //                .orderByDesc(AmsExecuteRecord::getCreateTime);
 
         Page<ExecuteResponse> result = this.baseMapper.pageExecute(this.buildPageObj(executeRequest), executeRequest, SuperWhaleContext.getContext(PublicUserInfo.class).getUserId());
-        return this.convertPublicPage(result, s -> BeanUtil.copyProperties(s, ExecuteResponse.class));
+        return this.convertPublicPage(result, s -> {
+            ExecuteResponse executeResponse = BeanUtil.copyProperties(s, ExecuteResponse.class);
+            if (StrUtil.isNotBlank(s.getParamsStr())) {
+                executeResponse.setAirdropParams(JSON.parseArray(s.getParamsStr(), AirdropParam.class));
+            }
+            return executeResponse;
+        });
     }
 
     @Override

src/main/resources/mapper/AmsExcuteRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ichaoj.ams.mapper.AmsExecuteRecordMapper">
     <select id="pageExecute" resultType="com.ichaoj.ams.response.execute.ExecuteResponse">
-        SELECT count(*) totalCount,
+        SELECT er.airdrop_params params_str,
         er.execute_id, er.execute_times, er.project_id, er.task_id, er.user_id, er.group_name, er.from_asset,
         er.to_asset, er.interval_min,
         er.interval_max, er.amount, er.max_gas, er.execute_status, er.create_time, er.update_time,