From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 二月 2025 10:08:32 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java index b11d721..4274e19 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java @@ -15,6 +15,7 @@ import com.zy.asrs.wms.asrs.service.MatFieldService; import com.zy.asrs.wms.asrs.service.MatFieldValueService; import com.zy.asrs.wms.asrs.service.TagService; +import com.zy.asrs.wms.common.annotation.CacheData; import com.zy.asrs.wms.common.annotation.OperationLog; import com.zy.asrs.wms.common.domain.BaseParam; import com.zy.asrs.wms.common.domain.KeyValVo; @@ -47,6 +48,7 @@ @PreAuthorize("hasAuthority('asrs:mat:list')") @PostMapping("/mat/page") + @CacheData(tableName = {"man_mat"}) public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class); @@ -67,12 +69,14 @@ @PreAuthorize("hasAuthority('asrs:mat:list')") @PostMapping("/mat/list") + @CacheData(tableName = {"man_mat"}) public R list(@RequestBody Map<String, Object> map) { return R.ok().add(matService.list()); } @PreAuthorize("hasAuthority('asrs:mat:list')") @GetMapping("/mat/{id}") + @CacheData(tableName = {"man_mat"}) public R get(@PathVariable("id") Long id) { return R.ok().add(matService.getById(id)); } @@ -131,7 +135,11 @@ @PreAuthorize("hasAuthority('asrs:mat:list')") @PostMapping("/mat/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { - List<Mat> list = matService.parseMat(matService.list()); + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class); + List<Mat> data = matService.list(pageParam.buildWrapper(true)); + + List<Mat> list = matService.parseMat(data); List<MatField> matFields = matFieldService.getMatFields(); ExcelUtil.build(ExcelUtil.create(list, Mat.class, matFields), response); } -- Gitblit v1.9.1