refactor(chart): 优化图表模板接口返回数据
This commit is contained in:
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
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.role.pojos.dao.CoreChartTable;
|
||||
import com.tiesheng.role.pojos.dao.CoreChartTemplate;
|
||||
@@ -35,14 +36,18 @@ public class ChartTemplateController {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public ApiResp<List<CoreChartTemplate>> list(PageDTO dto) {
|
||||
List<CoreChartTemplate> list = chartService.list(new QueryWrapper<CoreChartTemplate>()
|
||||
@GetMapping("/page")
|
||||
public ApiResp<List<CoreChartTemplate>> page(PageDTO dto) {
|
||||
|
||||
QueryWrapper<CoreChartTemplate> queryWrapper = new QueryWrapper<CoreChartTemplate>()
|
||||
.eq("is_deleted", 0)
|
||||
.like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword())
|
||||
.orderByAsc("sort")
|
||||
);
|
||||
return ApiResp.respOK(list);
|
||||
.orderByAsc("sort");
|
||||
dto.likeColumns(queryWrapper, "name", "table_name", "table_title");
|
||||
|
||||
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)
|
||||
.like(StrUtil.isNotEmpty(dto.getKeyword()), "table_name", dto.getKeyword())
|
||||
);
|
||||
return ApiResp.respOK(list);
|
||||
return ApiResp.respOK(list, list.size());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user