From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
index 00c2dc3..d9e4876 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
@@ -4,51 +4,71 @@
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.framework.exception.CoolException;
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.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
+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.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 WaitPakinItemController extends BaseController {
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
@PostMapping("/waitPakinItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaitPakinItem, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakinItem.class);
- return R.ok().add(waitPakinItemService.page(pageParam, pageParam.buildWrapper(true)));
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<WaitPakinItem, BaseParam> page = waitPakinItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<WaitPakinItem> records = page.getRecords();
+ for (WaitPakinItem 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:waitPakinItem:list')")
@PostMapping("/waitPakinItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waitPakinItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinItemService.list()));
}
@PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
@PostMapping({"/waitPakinItem/many/{ids}", "/waitPakinItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waitPakinItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
@GetMapping("/waitPakinItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waitPakinItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waitPakinItem:save')")
@@ -62,7 +82,7 @@
if (!waitPakinItemService.save(waitPakinItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waitPakinItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waitPakinItem));
}
@PreAuthorize("hasAuthority('manager:waitPakinItem:update')")
@@ -74,17 +94,24 @@
if (!waitPakinItemService.updateById(waitPakinItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waitPakinItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waitPakinItem));
}
@PreAuthorize("hasAuthority('manager:waitPakinItem:remove')")
@OperationLog("Delete 缁勬嫋妗ｆ槑缁�")
@PostMapping("/waitPakinItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids) || ids.length < 1) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, ids));
+ if (!taskItems.isEmpty()) {
+ throw new CoolException("鏈変换鍔℃槑缁嗘湭瀹屾垚");
+ }
if (!waitPakinItemService.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:waitPakinItem:list')")
@@ -98,13 +125,13 @@
waitPakinItemService.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:waitPakinItem:list')")
@PostMapping("/waitPakinItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinItemService.list(), WaitPakinItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waitPakinItemService.list()), WaitPakinItem.class), response);
}
}
--
Gitblit v1.9.1