From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index ac79f29..1d29f84 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -2,31 +2,70 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.service.ListExportHandler;
+import com.vincent.rsf.server.common.service.ListExportService;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳尯搴撳瓨鏄庣粏")
@RestController
public class WarehouseAreasItemController extends BaseController {
-
@Autowired
private WarehouseAreasItemService warehouseAreasItemService;
+
+ @Autowired
+ private ListExportService listExportService;
+
+ private final ListExportHandler<WarehouseAreasItem, BaseParam> warehouseAreasItemExportHandler = new ListExportHandler<>() {
+ @Override
+ public List<WarehouseAreasItem> listByIds(List<Long> ids) {
+ return warehouseAreasItemService.listByIds(ids);
+ }
+
+ @Override
+ public List<WarehouseAreasItem> listByFilter(Map<String, Object> sanitizedMap, BaseParam baseParam) {
+ PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ FieldsUtils.setFieldsFilters(queryWrapper, pageParam, WarehouseAreasItem.class);
+ return warehouseAreasItemService.list(queryWrapper);
+ }
+
+ @Override
+ public void fillExportFields(List<WarehouseAreasItem> records) {
+ fillExtendFields(records);
+ }
+
+ @Override
+ public Map<String, Object> toExportRow(WarehouseAreasItem record, List<ExcelUtil.ExportColumn> columns) {
+ return buildExportRow(record, columns);
+ }
+
+ @Override
+ public String defaultReportTitle() {
+ return "鏀惰揣搴撳瓨鎶ヨ〃";
+ }
+ };
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/page")
@@ -34,32 +73,58 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
- queryWrapper.select( "id","area_id","area_name","asn_id","plat_item_id","po_code",
- "asn_code", "asn_item_id","matnr_id","maktx","matnr_code","fields_index","track_code",
- "SUM(anfme) anfme","SUM(work_qty) work_qty","ispt_result","SUM(qty) qty", "splr_batch","batch","unit","stock_unit",
- "brand","shipper_id","splr_id","weight","prod_time","`status`", "create_by",
- "create_time","update_by","update_time","memo");
- queryWrapper.groupBy("matnr_code", "splr_batch", "track_code");
- return R.ok().add(warehouseAreasItemService.page(pageParam, queryWrapper));
+ /**鎷兼帴鎵╁睍瀛楁杩囨护*/
+ FieldsUtils.setFieldsFilters(queryWrapper,pageParam, WarehouseAreasItem.class);
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<WarehouseAreasItem, BaseParam> page = warehouseAreasItemService.page(pageParam, queryWrapper);
+ List<WarehouseAreasItem> records = page.getRecords();
+ for (WarehouseAreasItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
+ @PostMapping("/warehouseAreasItem/ispts/page")
+ public R getIsptPage(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ /**鎷兼帴鎵╁睍瀛楁*/
+ IPage<WarehouseAreasItem> page = warehouseAreasItemService.pageByItemId(pageParam, queryWrapper);
+ List<WarehouseAreasItem> records = page.getRecords();
+ for (WarehouseAreasItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok(warehouseAreasItemService.getList());
-// return R.ok().add(warehouseAreasItemService.list());
+// return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.list()));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list' )")
@PostMapping({"/warehouseAreasItem/many/{ids}", "/warehouseAreasItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(warehouseAreasItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@GetMapping("/warehouseAreasItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(warehouseAreasItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
@@ -71,7 +136,7 @@
if (!warehouseAreasItemService.save(warehouseAreasItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(warehouseAreasItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(warehouseAreasItem));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:update')")
@@ -83,7 +148,7 @@
if (!warehouseAreasItemService.updateById(warehouseAreasItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(warehouseAreasItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(warehouseAreasItem));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:remove')")
@@ -93,7 +158,7 @@
if (!warehouseAreasItemService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@@ -107,13 +172,43 @@
warehouseAreasItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(warehouseAreasItemService.list(), WarehouseAreasItem.class), response);
+ listExportService.export(
+ map,
+ exportMap -> buildParam(exportMap, BaseParam.class),
+ warehouseAreasItemExportHandler,
+ response
+ );
+ }
+
+ private void fillExtendFields(List<WarehouseAreasItem> records) {
+ for (WarehouseAreasItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ }
+ private Map<String, Object> buildExportRow(WarehouseAreasItem record, List<ExcelUtil.ExportColumn> columns) {
+ BeanWrapper beanWrapper = new BeanWrapperImpl(record);
+ Map<String, Object> row = new LinkedHashMap<>();
+ row.put("extendFields", record.getExtendFields());
+
+ for (ExcelUtil.ExportColumn column : columns) {
+ if (column.getSource().startsWith("extendFields.[")) {
+ continue;
+ }
+ if (beanWrapper.isReadableProperty(column.getSource())) {
+ row.put(column.getSource(), beanWrapper.getPropertyValue(column.getSource()));
+ }
+ }
+
+ return row;
}
}
--
Gitblit v1.9.1