diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskItemController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskItemController.java index d9af9db..afe3c94 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskItemController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtAggregationTaskItemController.java @@ -10,9 +10,9 @@ import com.ruoyi.common.select.SelectItem; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.UsdtAggregationTaskItem; import com.ruoyi.system.domain.UsdtAggregationTaskItemPlus; +import com.ruoyi.system.domain.vo.AggregationExecuteRequest; 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.*; @@ -21,20 +21,21 @@ import java.util.List; /** * 归集任务明细Controller - * + * * @author luqj * @date 2026-01-01 */ @RestController @RequestMapping("/system/usdtTaskItem") -public class UsdtAggregationTaskItemController extends BaseController -{ +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, @@ -58,65 +59,65 @@ public class UsdtAggregationTaskItemController extends BaseController request.setConfigurationPassword(null); } } + @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:getByIds')") @PostMapping("/getByIds") - public AjaxResult getByIds(@RequestBody Ids ids) - { - List list = usdtAggregationTaskItemService.getByIds(ids.getLongIds(),false,UsdtAggregationTaskItemPlus::getRemark,UsdtAggregationTaskItemPlus::getId); + public AjaxResult getByIds(@RequestBody Ids ids) { + List list = usdtAggregationTaskItemService.getByIds(ids.getLongIds(), false, UsdtAggregationTaskItemPlus::getRemark, UsdtAggregationTaskItemPlus::getId); return AjaxResult.success(list); } + @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-getByIds')") @PostMapping("/user/getByIds") - public AjaxResult userGetByIds(@RequestBody Ids ids) - { - List list = usdtAggregationTaskItemService.getByIds(ids.getLongIds(),true,UsdtAggregationTaskItemPlus::getUserId,UsdtAggregationTaskItemPlus::getRemark,UsdtAggregationTaskItemPlus::getId); + public AjaxResult userGetByIds(@RequestBody Ids ids) { + List list = usdtAggregationTaskItemService.getByIds(ids.getLongIds(), true, UsdtAggregationTaskItemPlus::getUserId, UsdtAggregationTaskItemPlus::getRemark, UsdtAggregationTaskItemPlus::getId); return AjaxResult.success(list); } + @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:select')") @GetMapping("/select") - public AjaxResult select(String keyword) - { - List list = usdtAggregationTaskItemService.select(keyword,false); + public AjaxResult select(String keyword) { + List list = usdtAggregationTaskItemService.select(keyword, false); return AjaxResult.success(list); } + @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-select')") @GetMapping("/user/select") - public AjaxResult userSelect(String keyword) - { - List list = usdtAggregationTaskItemService.select(keyword,true); + public AjaxResult userSelect(String keyword) { + List list = usdtAggregationTaskItemService.select(keyword, true); return AjaxResult.success(list); } + /** * 查询归集任务明细列表 */ @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:list')") @GetMapping("/list") - public TableDataInfo list(UsdtAggregationTaskItem usdtAggregationTaskItem) - { + public TableDataInfo list(UsdtAggregationTaskItem usdtAggregationTaskItem) { startPage(); - List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem,false); + List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem, false); return getDataTable(list); } -/** - * 查询归集任务明细列表 - */ -@PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-list')") -@GetMapping("/user/list") - public TableDataInfo userList(UsdtAggregationTaskItem usdtAggregationTaskItem) - { + + /** + * 查询归集任务明细列表 + */ + @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-list')") + @GetMapping("/user/list") + public TableDataInfo userList(UsdtAggregationTaskItem usdtAggregationTaskItem) { startPage(); - List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem,true); + List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem, true); return getDataTable(list); } - /** + + /** * 导出归集任务明细列表 */ @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:export')") @Log(title = "归集任务明细", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(UsdtAggregationTaskItem usdtAggregationTaskItem) - { - List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem,false); + public AjaxResult export(UsdtAggregationTaskItem usdtAggregationTaskItem) { + List list = usdtAggregationTaskItemService.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem, false); ExcelUtil util = new ExcelUtil(UsdtAggregationTaskItem.class); return util.exportExcel(list, "usdtTaskItem"); } @@ -127,19 +128,18 @@ public class UsdtAggregationTaskItemController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:query')") @RequestMapping(value = "/{id}", method = {RequestMethod.GET, RequestMethod.POST}) - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(usdtAggregationTaskItemService.selectUsdtAggregationTaskItemById(id,false)); + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(usdtAggregationTaskItemService.selectUsdtAggregationTaskItemById(id, false)); } + /** * 获取当前用户的归集任务明细详细信息。 * 兼容 POST 查询,仍由服务层校验明细归属,不允许借此修改或执行归集明细。 */ @PreAuthorize("@ss.hasPermi('system:usdtTaskItem:user-query')") @RequestMapping(value = "/user/{id}", method = {RequestMethod.GET, RequestMethod.POST}) - public AjaxResult userGetInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(usdtAggregationTaskItemService.selectUsdtAggregationTaskItemById(id,true)); + public AjaxResult userGetInfo(@PathVariable("id") Long id) { + return AjaxResult.success(usdtAggregationTaskItemService.selectUsdtAggregationTaskItemById(id, true)); } /* * 明细金额、来源地址、目标地址和执行状态均由归集工作流维护。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTask.java index 97bc59b..fa92068 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTask.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -19,6 +21,8 @@ public class UsdtAggregationTask extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 任务名称 */ @@ -27,10 +31,14 @@ public class UsdtAggregationTask extends BaseEntity /** 应用 */ @Excel(name = "应用") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long appId; /** 用户 */ @Excel(name = "用户") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** 状态 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java index 237017e..bb22172 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItem.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -19,6 +21,8 @@ public class UsdtAggregationTaskItem extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 钱包地址 */ @@ -70,14 +74,20 @@ public class UsdtAggregationTaskItem extends BaseEntity /** 用户 */ @Excel(name = "用户") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** 应用 */ @Excel(name = "应用") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long appId; /** 父任务 */ @Excel(name = "父任务") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 归集地址 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java index c6be51f..579eae5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskItemPlus.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -22,6 +24,8 @@ public class UsdtAggregationTaskItemPlus implements Serializable private static final long serialVersionUID = 1L; /** 主键 */ + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 钱包地址 */ @Excel(name = "钱包地址") @@ -64,12 +68,18 @@ public class UsdtAggregationTaskItemPlus implements Serializable private Long willUseTrxNum; /** 用户 */ @Excel(name = "用户") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** 应用 */ @Excel(name = "应用") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long appId; /** 父任务 */ @Excel(name = "父任务") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 归集地址 */ @Excel(name = "归集地址") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskPlus.java index a811502..aa7c6e5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtAggregationTaskPlus.java @@ -6,6 +6,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -26,15 +28,21 @@ public class UsdtAggregationTaskPlus implements Serializable /** 主键 */ @TableId(type = IdType.INPUT) + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 任务名称 */ @Excel(name = "任务名称") private String taskName; /** 应用 */ @Excel(name = "应用") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long appId; /** 用户 */ @Excel(name = "用户") + // ID 以字符串输出,避免浏览器 Number 解析雪花 ID 时丢失精度。 + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** 备注 */ @Excel(name = "备注") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskItemServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskItemServiceImpl.java index eaaa33e..88d931c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskItemServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtAggregationTaskItemServiceImpl.java @@ -17,71 +17,76 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import java.util.*; + /** * 归集任务明细Service业务层处理 - * + * * @author luqj * @date 2026-01-01 */ @Service -public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl implements IUsdtAggregationTaskItemService -{ +public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl implements IUsdtAggregationTaskItemService { @Autowired private UsdtAggregationTaskItemMapper usdtAggregationTaskItemMapper; @Autowired private JdbcTemplate jdbcTemplate; @Override - public List getByIds(List ids ,boolean isUser, SFunction... columns) { + public List getByIds(List ids, boolean isUser, SFunction... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() .select(columns).in(UsdtAggregationTaskItemPlus::getId, ids); - if(isUser){ + if (isUser) { lambdaQueryWrapper.eq(UsdtAggregationTaskItemPlus::getUserId, SecurityUtils.getUserId()); } List list = this.list(lambdaQueryWrapper); - if(isUser){ + if (isUser) { checkUserPlus(list); } return list; } + private void checkUserPlus(List list) { - for (UsdtAggregationTaskItemPlus item : list){ - if(null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()){ + for (UsdtAggregationTaskItemPlus item : list) { + if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { throw new RuntimeException("无权限"); } } } + private void checkUser(List list) { - for (UsdtAggregationTaskItem item : list){ - if(null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()){ + for (UsdtAggregationTaskItem item : list) { + if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { throw new RuntimeException("无权限"); } } } + private void checkUser(UsdtAggregationTaskItemPlus item) { - if(null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()){ + if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { throw new RuntimeException("无权限"); } } + private void checkUser(UsdtAggregationTaskItem item) { - if(null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()){ + if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { throw new RuntimeException("无权限"); } } + @Override - public List select(String keyword,boolean isUser) { + public List select(String keyword, boolean isUser) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() - .select(UsdtAggregationTaskItemPlus::getId,UsdtAggregationTaskItemPlus::getUserId, UsdtAggregationTaskItemPlus::getRemark) + .select(UsdtAggregationTaskItemPlus::getId, UsdtAggregationTaskItemPlus::getUserId, UsdtAggregationTaskItemPlus::getRemark) .like(UsdtAggregationTaskItemPlus::getRemark, keyword); - if(isUser){ + if (isUser) { lambdaQueryWrapper.eq(UsdtAggregationTaskItemPlus::getUserId, SecurityUtils.getUserId()); } List list = this.list(lambdaQueryWrapper); - if(isUser){ + if (isUser) { checkUserPlus(list); } - List result =new ArrayList<>(); - for (UsdtAggregationTaskItemPlus item : list){ + List result = new ArrayList<>(); + for (UsdtAggregationTaskItemPlus item : list) { SelectItem selectItem = new SelectItem(); selectItem.setName(item.getRemark()); selectItem.setId(item.getId()); @@ -89,6 +94,7 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() @@ -98,7 +104,7 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl getMapByIds(List ids, SFunction... columns) { - List list = this.getByIds(ids,false, columns); + List list = this.getByIds(ids, false, columns); Map map = new HashMap<>(); for (UsdtAggregationTaskItemPlus item : list) { map.put(item.getId(), item); @@ -173,17 +179,17 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); return tList; } + /** * 查询归集任务明细 - * + * * @param id 归集任务明细ID * @return 归集任务明细 */ @Override - public UsdtAggregationTaskItem selectUsdtAggregationTaskItemById(Long id,boolean isUser) - { + public UsdtAggregationTaskItem selectUsdtAggregationTaskItemById(Long id, boolean isUser) { UsdtAggregationTaskItem vo = usdtAggregationTaskItemMapper.selectUsdtAggregationTaskItemById(id); - if(isUser){ + if (isUser) { checkUser(vo); } return vo; @@ -191,21 +197,20 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl selectUsdtAggregationTaskItemList(UsdtAggregationTaskItem usdtAggregationTaskItem,boolean isUser) - { - if(usdtAggregationTaskItem == null){ - usdtAggregationTaskItem = new UsdtAggregationTaskItem(); + public List selectUsdtAggregationTaskItemList(UsdtAggregationTaskItem usdtAggregationTaskItem, boolean isUser) { + if (usdtAggregationTaskItem == null) { + usdtAggregationTaskItem = new UsdtAggregationTaskItem(); } - if(isUser){ + if (isUser) { usdtAggregationTaskItem.setUserId(SecurityUtils.getUserId()); } List list = usdtAggregationTaskItemMapper.selectUsdtAggregationTaskItemList(usdtAggregationTaskItem); - if(isUser){ + if (isUser) { checkUser(list); } return list; @@ -213,16 +218,15 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl list= getByIds(Arrays.asList(ids),false,UsdtAggregationTaskItemPlus::getUserId,UsdtAggregationTaskItemPlus::getId); + public int deleteUsdtAggregationTaskItemByIds(Long[] ids, boolean isUser) { + if (isUser) { + List list = getByIds(Arrays.asList(ids), false, UsdtAggregationTaskItemPlus::getUserId, UsdtAggregationTaskItemPlus::getId); checkUserPlus(list); } return usdtAggregationTaskItemMapper.deleteUsdtAggregationTaskItemByIds(ids); @@ -262,15 +264,14 @@ public class UsdtAggregationTaskItemServiceImpl extends ServiceImpl