tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

refactor(chart): 优化图表模板接口返回数据

Browse Source
This commit is contained in:
曾文豪
2025-05-22 16:52:13 +08:00
parent bce848af7e
commit 1cf97feabf
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
springboot-chart/src/main/java/com/tiesheng/role/controller/ChartTemplateController.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.annotation.role.RoleAuthority; import com.tiesheng.annotation.role.RoleAuthority;
import com.tiesheng.role.pojos.dao.CoreChartTable; import com.tiesheng.role.pojos.dao.CoreChartTable;
import com.tiesheng.role.pojos.dao.CoreChartTemplate; import com.tiesheng.role.pojos.dao.CoreChartTemplate;
@@ -35,14 +36,18 @@ public class ChartTemplateController {
* *
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/page")
public ApiResp<List<CoreChartTemplate>> list(PageDTO dto) { public ApiResp<List<CoreChartTemplate>> page(PageDTO dto) {
List<CoreChartTemplate> list = chartService.list(new QueryWrapper<CoreChartTemplate>()
QueryWrapper<CoreChartTemplate> queryWrapper = new QueryWrapper<CoreChartTemplate>()
.eq("is_deleted", 0) .eq("is_deleted", 0)
.like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword()) .like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword())
.orderByAsc("sort") .orderByAsc("sort");
); dto.likeColumns(queryWrapper, "name", "table_name", "table_title");
return ApiResp.respOK(list);
Page<CoreChartTemplate> page = dto.pageObj();
chartService.page(page, queryWrapper);
return ApiResp.respOK(page.getRecords(), page.getTotal());
} }
/** /**
@@ -90,7 +95,7 @@ public class ChartTemplateController {
.eq("is_deleted", 0) .eq("is_deleted", 0)
.like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword()) .like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword())
); );
return ApiResp.respOK(list); return ApiResp.respOK(list, list.size());
} }
/** /**