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/TaskItemController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
index ca1b80d..a198d16 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
@@ -9,14 +9,17 @@
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.LocItem;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.service.TaskItemService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
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
@@ -30,25 +33,35 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskItem, BaseParam> pageParam = new PageParam<>(baseParam, TaskItem.class);
- return R.ok().add(taskItemService.page(pageParam, pageParam.buildWrapper(true)));
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<TaskItem, BaseParam> page = taskItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<TaskItem> records = page.getRecords();
+ for (TaskItem 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:taskItem:list')")
@PostMapping("/taskItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskItemService.list()));
}
@PreAuthorize("hasAuthority('manager:taskItem:list')")
@PostMapping({"/taskItem/many/{ids}", "/taskItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(taskItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:taskItem:list')")
@GetMapping("/taskItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:taskItem:save')")
@@ -62,7 +75,7 @@
if (!taskItemService.save(taskItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(taskItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(taskItem));
}
@PreAuthorize("hasAuthority('manager:taskItem:update')")
@@ -74,7 +87,7 @@
if (!taskItemService.updateById(taskItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(taskItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(taskItem));
}
@PreAuthorize("hasAuthority('manager:taskItem:remove')")
@@ -84,7 +97,7 @@
if (!taskItemService.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:taskItem:list')")
@@ -98,13 +111,13 @@
taskItemService.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:taskItem:list')")
@PostMapping("/taskItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskItemService.list(), TaskItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskItemService.list()), TaskItem.class), response);
}
}
--
Gitblit v1.9.1