From aaf8a50511d77dbc209ca93bbba308c21179a8bc Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 31 三月 2026 15:38:47 +0800
Subject: [PATCH] #前端
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 188 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 144 insertions(+), 44 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index 264d337..b910240 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -1,24 +1,30 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.manager.controller.params.InitContainerParams;
+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.manager.entity.BasContainer;
import com.vincent.rsf.server.manager.entity.BasStation;
+import com.vincent.rsf.server.manager.entity.WarehouseAreas;
import com.vincent.rsf.server.manager.service.BasContainerService;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.controller.BaseController;
+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.*;
@RestController
@@ -27,24 +33,18 @@
@Autowired
private BasContainerService basContainerService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+
+ @Autowired
+ private ListExportService listExportService;
+
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@PostMapping("/basContainer/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasContainer, BaseParam> pageParam = new PageParam<>(baseParam, BasContainer.class);
PageParam<BasContainer, BaseParam> page = basContainerService.page(pageParam, pageParam.buildWrapper(true));
-// for (BasContainer container : page.getRecords()) {
-// if (!Cools.isEmpty(container.getAreas())) {
-// String content = container.getAreas().substring(1, container.getAreas().length() - 1);
-// String[] parts = content.split(",");
-// Long[] longArray = new Long[parts.length];
-// for (int i = 0; i < parts.length; i++) {
-// longArray[i] = Long.parseLong(parts[i].trim());
-// }
-// container.setAreaIds(longArray);
-// }
-//
-// }
return R.ok().add(page);
}
@@ -64,13 +64,10 @@
@GetMapping("/basContainer/{id}")
public R get(@PathVariable("id") Long id) {
BasContainer basContainer = basContainerService.getById(id);
- String content = basContainer.getAreas().substring(1, basContainer.getAreas().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
+ // 纭繚杩斿洖鐨刟reas鎸塻ort瀛楁鎺掑簭
+ if (basContainer != null) {
+ basContainer.sortAreas();
}
- basContainer.setAreaIds(longArray);
return R.ok().add(basContainer);
}
@@ -82,12 +79,13 @@
basContainer.setCreateTime(new Date());
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
+
+ // 纭繚areas鎸塻ort瀛楁鎺掑簭
+ basContainer.sortAreas();
+
BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()));
if (null != container) {
return R.error("璇ョ被鍨嬪凡琚垵濮嬪寲");
- }
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
}
if (!basContainerService.save(basContainer)) {
return R.error("Save Fail");
@@ -101,9 +99,10 @@
public R update(@RequestBody BasContainer basContainer) {
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
- }
+
+ // 纭繚areas鎸塻ort瀛楁鎺掑簭
+ basContainer.sortAreas();
+
if (!basContainerService.updateById(basContainer)) {
return R.error("Update Fail");
}
@@ -134,26 +133,127 @@
return R.ok().add(vos);
}
-
- /**
- * 鍒濆鍖�
- * @return
- */
- @PreAuthorize("hasAuthority('manager:basContainer:list')")
- @OperationLog("瀹瑰櫒鍒濆鍖�")
- @PostMapping("/basContainer/init/save")
- public R init(@RequestBody InitContainerParams params) {
- if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- return basContainerService.init(params, getLoginUserId());
- }
-
-
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@PostMapping("/basContainer/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(basContainerService.list(), BasContainer.class), response);
+ Map<Long, String> areaNameMap = buildAreaNameMap();
+ listExportService.export(
+ map,
+ exportMap -> buildParam(exportMap, BaseParam.class),
+ new ListExportHandler<BasContainer, BaseParam>() {
+ @Override
+ public List<BasContainer> listByIds(List<Long> ids) {
+ List<BasContainer> records = basContainerService.listByIds(ids);
+ records.forEach(BasContainer::sortAreas);
+ return records;
+ }
+
+ @Override
+ public List<BasContainer> listByFilter(Map<String, Object> sanitizedMap, BaseParam baseParam) {
+ PageParam<BasContainer, BaseParam> pageParam = new PageParam<>(baseParam, BasContainer.class);
+ QueryWrapper<BasContainer> queryWrapper = pageParam.buildWrapper(true);
+ List<BasContainer> records = basContainerService.list(queryWrapper);
+ records.forEach(BasContainer::sortAreas);
+ return records;
+ }
+
+ @Override
+ public void fillExportFields(List<BasContainer> records) {
+ records.forEach(BasContainer::sortAreas);
+ }
+
+ @Override
+ public Map<String, Object> toExportRow(BasContainer record, List<ExcelUtil.ExportColumn> columns) {
+ return buildExportRow(record, columns, areaNameMap);
+ }
+
+ @Override
+ public String defaultReportTitle() {
+ return "瀹瑰櫒瑙勫垯鎶ヨ〃";
+ }
+ },
+ response
+ );
+ }
+
+ private Map<Long, String> buildAreaNameMap() {
+ Map<Long, String> areaNameMap = new HashMap<>();
+ for (WarehouseAreas area : warehouseAreasService.list()) {
+ if (area != null && area.getId() != null) {
+ areaNameMap.put(area.getId(), area.getName());
+ }
+ }
+ return areaNameMap;
+ }
+
+ private Map<String, Object> buildExportRow(
+ BasContainer record,
+ List<ExcelUtil.ExportColumn> columns,
+ Map<Long, String> areaNameMap
+ ) {
+ BeanWrapper beanWrapper = new BeanWrapperImpl(record);
+ Map<String, Object> row = new LinkedHashMap<>();
+ for (ExcelUtil.ExportColumn column : columns) {
+ Object value = resolveExportValue(record, column.getSource(), beanWrapper, areaNameMap);
+ row.put(column.getSource(), value);
+ }
+ return row;
+ }
+
+ private Object resolveExportValue(
+ BasContainer record,
+ String source,
+ BeanWrapper beanWrapper,
+ Map<Long, String> areaNameMap
+ ) {
+ if ("containerTypeText".equals(source)) {
+ return record.getContainerType$();
+ }
+ if ("areasText".equals(source)) {
+ return buildAreasText(record, areaNameMap);
+ }
+ if ("status".equals(source)) {
+ return record.getStatusBool() == null ? "" : (record.getStatusBool() ? "姝ｅ父" : "鍐荤粨");
+ }
+ if ("createByText".equals(source)) {
+ return record.getCreateBy$();
+ }
+ if ("createTimeText".equals(source)) {
+ return record.getCreateTime$();
+ }
+ if ("updateByText".equals(source)) {
+ return record.getUpdateBy$();
+ }
+ if ("updateTimeText".equals(source)) {
+ return record.getUpdateTime$();
+ }
+ if (beanWrapper.isReadableProperty(source)) {
+ return beanWrapper.getPropertyValue(source);
+ }
+ return null;
+ }
+
+ private String buildAreasText(BasContainer record, Map<Long, String> areaNameMap) {
+ if (record == null || Cools.isEmpty(record.getAreas())) {
+ return "";
+ }
+ List<String> labels = new ArrayList<>();
+ for (Map<String, Object> area : record.getAreas()) {
+ if (area == null) {
+ continue;
+ }
+ Object idValue = area.get("id");
+ if (idValue == null) {
+ continue;
+ }
+ Long areaId = Long.valueOf(String.valueOf(idValue));
+ String label = areaNameMap.get(areaId);
+ if (Cools.isEmpty(label)) {
+ label = String.valueOf(idValue);
+ }
+ labels.add(label);
+ }
+ return String.join("銆�", labels);
}
}
--
Gitblit v1.9.1