归集任务逻辑
This commit is contained in:
1 parent
18e3eb8ff0
commit
38d038115a
8 files changed
+488
-126
No files matched your search
+51
-64
@@ -11,6 +11,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTask;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTaskPlus;
|
||||
import com.ruoyi.system.service.IUsdtAggregationTaskService;
|
||||
import com.ruoyi.system.service.UsdtAggregationWorkflowService;
|
||||
import com.ruoyi.system.domain.vo.AggregationExecuteRequest;
|
||||
import com.ruoyi.system.domain.vo.AggregationTaskCreateRequest;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -28,17 +31,53 @@ import java.util.List;
|
||||
public class UsdtAggregationTaskController extends BaseController {
|
||||
@Autowired
|
||||
private IUsdtAggregationTaskService usdtAggregationTaskService;
|
||||
/** 触发归集任务;实际明细执行由后台任务处理,避免阻塞 HTTP 请求。 */
|
||||
@Autowired
|
||||
private UsdtAggregationWorkflowService aggregationWorkflowService;
|
||||
|
||||
/** 创建应用下全部子钱包的 USDT 归集任务。 */
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:add')")
|
||||
@PostMapping("/create")
|
||||
public AjaxResult create(@RequestBody AggregationTaskCreateRequest request) {
|
||||
return AjaxResult.success(aggregationWorkflowService.create(request, false));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:user-add')")
|
||||
@PostMapping("/user/create")
|
||||
public AjaxResult userCreate(@RequestBody AggregationTaskCreateRequest request) {
|
||||
return AjaxResult.success(aggregationWorkflowService.create(request, true));
|
||||
}
|
||||
|
||||
/** 管理员审核归集任务:approved=true 通过,false 拒绝。 */
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:edit')")
|
||||
@PostMapping("/{id}/review")
|
||||
public AjaxResult review(@PathVariable("id") Long id, @RequestParam boolean approved) {
|
||||
aggregationWorkflowService.approve(id, approved);
|
||||
return AjaxResult.success(approved ? "审核通过" : "审核拒绝");
|
||||
}
|
||||
|
||||
/** 审核通过后,使用配置密码同步签名并执行所有待执行或失败明细。 */
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:execute')")
|
||||
@PostMapping("/{id}/execute")
|
||||
public AjaxResult execute(@PathVariable("id") Long id) {
|
||||
UsdtAggregationTask task = usdtAggregationTaskService.selectUsdtAggregationTaskById(id, false);
|
||||
if (task == null) return AjaxResult.error("任务不存在");
|
||||
if (task.getStatus() != null && task.getStatus() == 1) return AjaxResult.error("任务正在执行");
|
||||
task.setStatus(1);
|
||||
task.setExeTime(new java.util.Date());
|
||||
usdtAggregationTaskService.updateUsdtAggregationTask(task, false);
|
||||
return AjaxResult.success("任务已进入执行队列");
|
||||
public AjaxResult execute(@PathVariable("id") Long id,
|
||||
@RequestBody AggregationExecuteRequest request) {
|
||||
try {
|
||||
aggregationWorkflowService.executeTask(id, request.getConfigurationPassword(), false);
|
||||
return AjaxResult.success("归集任务执行完成");
|
||||
} finally {
|
||||
request.setConfigurationPassword(null);
|
||||
}
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:user-edit')")
|
||||
@PostMapping("/user/{id}/execute")
|
||||
public AjaxResult userExecute(@PathVariable("id") Long id,
|
||||
@RequestBody AggregationExecuteRequest request) {
|
||||
try {
|
||||
aggregationWorkflowService.executeTask(id, request.getConfigurationPassword(), true);
|
||||
return AjaxResult.success("归集任务执行完成");
|
||||
} finally {
|
||||
request.setConfigurationPassword(null);
|
||||
}
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:getByIds')")
|
||||
@@ -121,60 +160,8 @@ public class UsdtAggregationTaskController extends BaseController {
|
||||
return AjaxResult.success(usdtAggregationTaskService.selectUsdtAggregationTaskById(id, true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增归集任务
|
||||
/*
|
||||
* 归集任务的状态、审核结果、目标地址和执行时间必须由工作流维护。
|
||||
* 不暴露代码生成器的通用新增、编辑和删除接口,防止绕过审核流程。
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:add')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody UsdtAggregationTask usdtAggregationTask) {
|
||||
return toAjax(usdtAggregationTaskService.insertUsdtAggregationTask(usdtAggregationTask, false));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增归集任务
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:user-add')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/user")
|
||||
public AjaxResult userAdd(@RequestBody UsdtAggregationTask usdtAggregationTask) {
|
||||
return toAjax(usdtAggregationTaskService.insertUsdtAggregationTask(usdtAggregationTask, true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改归集任务
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:edit')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody UsdtAggregationTask usdtAggregationTask) {
|
||||
return toAjax(usdtAggregationTaskService.updateUsdtAggregationTask(usdtAggregationTask, false));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:user-edit')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/user")
|
||||
public AjaxResult userEdit(@RequestBody UsdtAggregationTask usdtAggregationTask) {
|
||||
return toAjax(usdtAggregationTaskService.updateUsdtAggregationTask(usdtAggregationTask, true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除归集任务
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:remove')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
return toAjax(usdtAggregationTaskService.deleteUsdtAggregationTaskByIds(ids, false));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除归集任务
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:user-remove')")
|
||||
@Log(title = "归集任务", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/user/{ids}")
|
||||
public AjaxResult userRemove(@PathVariable Long[] ids) {
|
||||
return toAjax(usdtAggregationTaskService.deleteUsdtAggregationTaskByIds(ids, true));
|
||||
}
|
||||
}
|
||||
+32
-56
@@ -11,6 +11,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTaskItem;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTaskItemPlus;
|
||||
import com.ruoyi.system.service.IUsdtAggregationTaskItemService;
|
||||
import com.ruoyi.system.service.UsdtAggregationWorkflowService;
|
||||
import com.ruoyi.system.domain.vo.AggregationExecuteRequest;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -29,6 +31,33 @@ public class UsdtAggregationTaskItemController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IUsdtAggregationTaskItemService usdtAggregationTaskItemService;
|
||||
@Autowired
|
||||
private UsdtAggregationWorkflowService aggregationWorkflowService;
|
||||
|
||||
/** 手动重新执行单个失败明细,仍要求配置密码。 */
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:edit')")
|
||||
@PostMapping("/{id}/retry")
|
||||
public AjaxResult retry(@PathVariable("id") Long id,
|
||||
@RequestBody AggregationExecuteRequest request) {
|
||||
try {
|
||||
aggregationWorkflowService.retryItem(id, request.getConfigurationPassword(), false);
|
||||
return AjaxResult.success("归集明细重试完成");
|
||||
} finally {
|
||||
request.setConfigurationPassword(null);
|
||||
}
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-edit')")
|
||||
@PostMapping("/user/{id}/retry")
|
||||
public AjaxResult userRetry(@PathVariable("id") Long id,
|
||||
@RequestBody AggregationExecuteRequest request) {
|
||||
try {
|
||||
aggregationWorkflowService.retryItem(id, request.getConfigurationPassword(), true);
|
||||
return AjaxResult.success("归集明细重试完成");
|
||||
} finally {
|
||||
request.setConfigurationPassword(null);
|
||||
}
|
||||
}
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:getByIds')")
|
||||
@PostMapping("/getByIds")
|
||||
public AjaxResult getByIds(@RequestBody Ids ids)
|
||||
@@ -110,61 +139,8 @@ public class UsdtAggregationTaskItemController extends BaseController
|
||||
{
|
||||
return AjaxResult.success(usdtAggregationTaskItemService.selectUsdtAggregationTaskItemById(id,true));
|
||||
}
|
||||
/**
|
||||
* 新增归集任务明细
|
||||
/*
|
||||
* 明细金额、来源地址、目标地址和执行状态均由归集工作流维护。
|
||||
* 对外只保留查询与失败项重试接口,禁止任意增删改明细。
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:add')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody UsdtAggregationTaskItem usdtAggregationTaskItem)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.insertUsdtAggregationTaskItem(usdtAggregationTaskItem,false));
|
||||
}
|
||||
/**
|
||||
* 新增归集任务明细
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-add')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/user")
|
||||
public AjaxResult userAdd(@RequestBody UsdtAggregationTaskItem usdtAggregationTaskItem)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.insertUsdtAggregationTaskItem(usdtAggregationTaskItem,true));
|
||||
}
|
||||
/**
|
||||
* 修改归集任务明细
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:edit')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody UsdtAggregationTaskItem usdtAggregationTaskItem)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.updateUsdtAggregationTaskItem(usdtAggregationTaskItem,false));
|
||||
}
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-edit')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/user")
|
||||
public AjaxResult userEdit(@RequestBody UsdtAggregationTaskItem usdtAggregationTaskItem)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.updateUsdtAggregationTaskItem(usdtAggregationTaskItem,true));
|
||||
}
|
||||
/**
|
||||
* 删除归集任务明细
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:remove')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.deleteUsdtAggregationTaskItemByIds(ids,false));
|
||||
}
|
||||
/**
|
||||
* 删除归集任务明细
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-remove')")
|
||||
@Log(title = "归集任务明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/user/{ids}")
|
||||
public AjaxResult userRemove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(usdtAggregationTaskItemService.deleteUsdtAggregationTaskItemByIds(ids,true));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user