usdt归集明细页面usdtTaskItem和USDTmanage/usdtTaskItem,添加取消归集明细任务功能。

This commit is contained in:
lu7213 committed 2026-11-03 07:58:08 -05:00
1 parent 2870c3fb6c
commit 62f43056e2
8 files changed
+161 -10

No files matched your search

+2
View File
@@ -1,5 +1,7 @@
## 平台简介 ## 平台简介
归集明细支持管理端及用户端取消:`POST /system/usdtTaskItem/{id}/cancel`、`POST /system/usdtTaskItem/user/{id}/cancel`,分别复用明细 edit/user-edit 权限,用户端校验任务及明细归属。仅待执行明细可取消,取消保留审计记录且不可恢复。明细状态为 `0=待执行、1=成功、2=失败、3=已取消、4=执行中`;执行前以条件更新抢占明细,取消成功后不会广播。无需变更表结构。
用户套餐绑定与默认套餐下单:旧库先执行 [绑定表增量SQL](sql/rent_user_package.sql),三个NILE示例套餐见 [套餐初始化脚本](sql/rent_seed_three_packages.sql),管理及API说明见 [用户套餐绑定](docs/rental/user-package-bindings.md)。升级后未绑定用户不能创建新租赁订单。 用户套餐绑定与默认套餐下单:旧库先执行 [绑定表增量SQL](sql/rent_user_package.sql),三个NILE示例套餐见 [套餐初始化脚本](sql/rent_seed_three_packages.sql),管理及API说明见 [用户套餐绑定](docs/rental/user-package-bindings.md)。升级后未绑定用户不能创建新租赁订单。
能量与带宽租赁模块:三端配置、业务API、Agent安装及验收边界见[租赁实现说明](docs/rental/implementation.md);初始化结构见[租赁SQL](sql/rent_init.sql),菜单权限见[租赁菜单SQL](sql/rent_menu.sql)。本地Agent可选Node.js或[JDK17 + JavaFX20.0.2桌面版](../rent-agent-java/README.md)。默认不启动租赁调度与节点通道,本地Agent默认禁止广播。 能量与带宽租赁模块:三端配置、业务API、Agent安装及验收边界见[租赁实现说明](docs/rental/implementation.md);初始化结构见[租赁SQL](sql/rent_init.sql),菜单权限见[租赁菜单SQL](sql/rent_menu.sql)。本地Agent可选Node.js或[JDK17 + JavaFX20.0.2桌面版](../rent-agent-java/README.md)。默认不启动租赁调度与节点通道,本地Agent默认禁止广播。
@@ -0,0 +1,93 @@
package com.ruoyi.web.controller.system;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.system.domain.UsdtAggregationTask;
import com.ruoyi.system.domain.UsdtAggregationTaskItem;
import com.ruoyi.system.domain.UsdtAggregationTaskItemPlus;
import com.ruoyi.system.mapper.UsdtAggregationTaskMapper;
import com.ruoyi.system.mapper.UsdtAggregationTaskItemMapper;
import com.ruoyi.system.service.UsdtAggregationWorkflowService;
import com.ruoyi.system.service.WalletSigningService;
import org.junit.Test;
import java.lang.reflect.Method;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
/** 不依赖数据库和链上节点,验证取消边界及旧执行快照不会绕过数据库取消状态。 */
public class AggregationItemCancellationTest {
@Test
public void cancelsOnlyWhenConditionalUpdateSucceeds() {
UsdtAggregationTaskMapper tasks = mock(UsdtAggregationTaskMapper.class);
UsdtAggregationTaskItemMapper items = mock(UsdtAggregationTaskItemMapper.class);
UsdtAggregationWorkflowService service = service(tasks, items);
UsdtAggregationTaskItem item = new UsdtAggregationTaskItem();
item.setParentId(10L);
when(items.selectUsdtAggregationTaskItemById(1L)).thenReturn(item);
when(tasks.selectUsdtAggregationTaskByIdForUpdate(10L)).thenReturn(new UsdtAggregationTask());
when(items.cancelPendingItem(1L)).thenReturn(1);
service.cancelItem(1L, false);
when(items.cancelPendingItem(1L)).thenReturn(0);
try {
service.cancelItem(1L, false);
fail("执行中、成功、失败和已取消状态必须拒绝取消");
} catch (CustomException expected) {
assertTrue(expected.getMessage().contains("仅待执行"));
}
}
@Test(expected = CustomException.class)
public void missingItemCannotBeCancelled() {
service(mock(UsdtAggregationTaskMapper.class), mock(UsdtAggregationTaskItemMapper.class))
.cancelItem(1L, false);
}
@Test
public void userCannotCancelAnotherUsersItem() {
UsdtAggregationTaskMapper tasks = mock(UsdtAggregationTaskMapper.class);
UsdtAggregationTaskItemMapper items = mock(UsdtAggregationTaskItemMapper.class);
UsdtAggregationTaskItem item = new UsdtAggregationTaskItem();
item.setParentId(10L);
item.setUserId(2L);
UsdtAggregationTask task = new UsdtAggregationTask();
task.setUserId(2L);
when(items.selectUsdtAggregationTaskItemById(1L)).thenReturn(item);
when(tasks.selectUsdtAggregationTaskByIdForUpdate(10L)).thenReturn(task);
com.ruoyi.common.core.domain.entity.SysUser user = new com.ruoyi.common.core.domain.entity.SysUser();
user.setUserId(1L);
com.ruoyi.common.core.domain.model.LoginUser login = new com.ruoyi.common.core.domain.model.LoginUser(
user, java.util.Collections.emptySet());
org.springframework.security.core.context.SecurityContextHolder.getContext().setAuthentication(
new org.springframework.security.authentication.UsernamePasswordAuthenticationToken(login, null));
try {
service(tasks, items).cancelItem(1L, true);
fail("不能取消其他用户的归集明细");
} catch (CustomException expected) {
verify(items, never()).cancelPendingItem(1L);
} finally {
org.springframework.security.core.context.SecurityContextHolder.clearContext();
}
}
@Test
public void cancelledSnapshotCannotReachSigningSession() throws Exception {
UsdtAggregationTaskItemMapper items = mock(UsdtAggregationTaskItemMapper.class);
UsdtAggregationWorkflowService service = service(null, items);
UsdtAggregationTaskItemPlus snapshot = new UsdtAggregationTaskItemPlus();
snapshot.setId(1L);
snapshot.setStatus(0L);
UsdtAggregationTaskItem current = new UsdtAggregationTaskItem();
current.setStatus(3L);
when(items.selectUsdtAggregationTaskItemById(1L)).thenReturn(current);
Method execute = UsdtAggregationWorkflowService.class.getDeclaredMethod("executeItemInternal",
UsdtAggregationTaskItemPlus.class, WalletSigningService.UnlockedWalletSession.class);
execute.setAccessible(true);
// 不提供钱包服务和签名会话:若取消检查后仍触达转账路径,调用会立即失败。
assertEquals(Boolean.TRUE, execute.invoke(service, snapshot, null));
}
private UsdtAggregationWorkflowService service(UsdtAggregationTaskMapper tasks,
UsdtAggregationTaskItemMapper items) {
return new UsdtAggregationWorkflowService(null, null, null, null, null,
tasks, items, null, null, null, null);
}
}
@@ -33,6 +33,22 @@ public class UsdtAggregationTaskItemController extends BaseController {
@Autowired @Autowired
private UsdtAggregationWorkflowService aggregationWorkflowService; private UsdtAggregationWorkflowService aggregationWorkflowService;
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:edit')")
@Log(title = "取消归集明细", businessType = BusinessType.UPDATE)
@PostMapping("/{id}/cancel")
public AjaxResult cancel(@PathVariable("id") Long id) {
aggregationWorkflowService.cancelItem(id, false);
return AjaxResult.success("归集明细已取消");
}
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-edit')")
@Log(title = "取消归集明细", businessType = BusinessType.UPDATE)
@PostMapping("/user/{id}/cancel")
public AjaxResult userCancel(@PathVariable("id") Long id) {
aggregationWorkflowService.cancelItem(id, true);
return AjaxResult.success("归集明细已取消");
}
/** /**
* 手动重新执行单个失败明细,仍要求配置密码。 * 手动重新执行单个失败明细,仍要求配置密码。
*/ */
@@ -143,6 +159,6 @@ public class UsdtAggregationTaskItemController extends BaseController {
} }
/* /*
* 明细金额、来源地址、目标地址和执行状态均由归集工作流维护。 * 明细金额、来源地址、目标地址和执行状态均由归集工作流维护。
* 对外只保留查询与失败项重试接口,禁止任意增删改明细。 * 对外仅开放查询、待执行项取消与失败项重试,禁止任意增删改明细。
*/ */
} }
@@ -29,8 +29,8 @@ public class UsdtAggregationTaskItem extends BaseEntity
@Excel(name = "钱包地址") @Excel(name = "钱包地址")
private String tokenAddress; private String tokenAddress;
/** 状态0 待执行 1 执行 2 执行失败 */ /** 明细状态:0 待执行,1 成功,2 失败,3 已取消,4 执行中。取消不可恢复。 */
@Excel(name = "状态0 待执行 1 执行 2 执行失败") @Excel(name = "状态", readConverterExp = "0=待执行,1=成功,2=失败,3=已取消,4=执行中")
private Long status; private Long status;
/** 金额 */ /** 金额 */
@@ -30,8 +30,8 @@ public class UsdtAggregationTaskItemPlus implements Serializable
/** 钱包地址 */ /** 钱包地址 */
@Excel(name = "钱包地址") @Excel(name = "钱包地址")
private String tokenAddress; private String tokenAddress;
/** 状态0 待执行 1 执行 2 执行失败 */ /** 明细状态:0 待执行,1 成功,2 失败,3 已取消,4 执行中。取消不可恢复。 */
@Excel(name = "状态0 待执行 1 执行 2 执行失败") @Excel(name = "状态", readConverterExp = "0=待执行,1=成功,2=失败,3=已取消,4=执行中")
private Long status; private Long status;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注")
@@ -15,6 +15,11 @@ import com.ruoyi.system.domain.UsdtAggregationTaskItemPlus;
*/ */
public interface UsdtAggregationTaskItemMapper extends BaseMapper<UsdtAggregationTaskItemPlus> public interface UsdtAggregationTaskItemMapper extends BaseMapper<UsdtAggregationTaskItemPlus>
{ {
/** 仅待执行明细可以取消;SQL 条件更新与执行抢占互斥。 */
int cancelPendingItem(@Param("id") Long id);
/** 广播前原子抢占明细,防止取消成功后仍按旧快照执行。 */
int claimItemForExecution(@Param("id") Long id);
/** /**
* 查询归集任务明细 * 查询归集任务明细
* *
@@ -157,6 +157,26 @@ public class UsdtAggregationWorkflowService {
.set(UsdtAggregationTaskItemPlus::getUpdatedAt, now)); .set(UsdtAggregationTaskItemPlus::getUpdatedAt, now));
} }
/** 取消保留原明细及资源预算作为审计记录,不能撤销已广播的链上交易。 */
@Transactional(rollbackFor = Exception.class)
public void cancelItem(Long itemId, boolean userMode) {
UsdtAggregationTaskItem item = itemMapper.selectUsdtAggregationTaskItemById(itemId);
if (item == null) {
throw new CustomException("归集明细不存在或已删除");
}
UsdtAggregationTask task = taskMapper.selectUsdtAggregationTaskByIdForUpdate(item.getParentId());
if (task == null) {
throw new CustomException("归集任务不存在或已删除");
}
if (userMode && (!SecurityUtils.getUserId().equals(task.getUserId())
|| !SecurityUtils.getUserId().equals(item.getUserId()))) {
throw new CustomException("无权取消该归集明细");
}
if (itemMapper.cancelPendingItem(itemId) != 1) {
throw new CustomException("仅待执行的归集明细可以取消,请刷新列表");
}
}
public void executeTask(Long taskId, String password, boolean userMode) { public void executeTask(Long taskId, String password, boolean userMode) {
UsdtAggregationTaskPlus task = requireTask(taskId, userMode); UsdtAggregationTaskPlus task = requireTask(taskId, userMode);
if (!Integer.valueOf(1).equals(task.getVerifyStatus())) { if (!Integer.valueOf(1).equals(task.getVerifyStatus())) {
@@ -237,12 +257,19 @@ public class UsdtAggregationWorkflowService {
private boolean executeItemInternal(UsdtAggregationTaskItemPlus item, private boolean executeItemInternal(UsdtAggregationTaskItemPlus item,
WalletSigningService.UnlockedWalletSession session) { WalletSigningService.UnlockedWalletSession session) {
WalletAddressPlus wallet = walletService.getByTokenAndAppId(item.getTokenAddress(), item.getAppId()); // 使用数据库状态而非列表快照决定是否允许广播,取消与执行只能有一方成功。
if (wallet == null) { if (itemMapper.claimItemForExecution(item.getId()) != 1) {
markFailed(item, "钱包不存在或已不属于当前应用"); UsdtAggregationTaskItem current = itemMapper.selectUsdtAggregationTaskItemById(item.getId());
return false; return current != null && (Long.valueOf(3L).equals(current.getStatus())
|| Long.valueOf(1L).equals(current.getStatus()));
} }
item.setStatus(4L);
try { try {
WalletAddressPlus wallet = walletService.getByTokenAndAppId(item.getTokenAddress(), item.getAppId());
if (wallet == null) {
markFailed(item, "钱包不存在或已不属于当前应用");
return false;
}
String tx = session.execute(wallet, (tron, api, current) -> String tx = session.execute(wallet, (tron, api, current) ->
tron.usdtTransWithBroadcastRetry(api, current.getToken(), tron.usdtTransWithBroadcastRetry(api, current.getToken(),
item.getDistTokenAddress(), item.getOpeAmount(), MAX_ATTEMPTS)); item.getDistTokenAddress(), item.getOpeAmount(), MAX_ATTEMPTS));
@@ -267,7 +294,7 @@ public class UsdtAggregationWorkflowService {
private void finishTask(UsdtAggregationTaskPlus task, boolean failed) { private void finishTask(UsdtAggregationTaskPlus task, boolean failed) {
task.setStatus(failed ? 3 : 2); task.setStatus(failed ? 3 : 2);
task.setUpdatedAt(DateUtils.getNowDate()); task.setUpdatedAt(DateUtils.getNowDate());
task.setRemark(failed ? "执行完成,存在失败明细" : "全部归集成功"); task.setRemark(failed ? "执行完成,存在失败明细" : "归集执行完成(已取消明细不参与执行)");
taskService.updateById(task); taskService.updateById(task);
} }
@@ -3,6 +3,14 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.UsdtAggregationTaskItemMapper"> <mapper namespace="com.ruoyi.system.mapper.UsdtAggregationTaskItemMapper">
<update id="cancelPendingItem">
update usdt_aggregation_task_item set status = 3, remark = '用户取消归集,未执行转账', updated_at = current_timestamp
where id = #{id} and status = 0 and deleted_at is null
</update>
<update id="claimItemForExecution">
update usdt_aggregation_task_item set status = 4, updated_at = current_timestamp
where id = #{id} and status in (0, 2) and deleted_at is null
</update>
<resultMap type="UsdtAggregationTaskItem" id="UsdtAggregationTaskItemResult"> <resultMap type="UsdtAggregationTaskItem" id="UsdtAggregationTaskItemResult">
<result property="id" column="id" /> <result property="id" column="id" />