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/system/controller/TaskInstanceController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
index 0600c7d..51cafe3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@@ -30,25 +31,25 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskInstance, BaseParam> pageParam = new PageParam<>(baseParam, TaskInstance.class);
- return R.ok().add(taskInstanceService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskInstanceService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:taskInstance:list')")
@PostMapping("/taskInstance/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskInstanceService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskInstanceService.list()));
}
@PreAuthorize("hasAuthority('system:taskInstance:list')")
@PostMapping({"/taskInstance/many/{ids}", "/taskInstances/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(taskInstanceService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskInstanceService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:taskInstance:list')")
@GetMapping("/taskInstance/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskInstanceService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskInstanceService.getById(id)));
}
@PreAuthorize("hasAuthority('system:taskInstance:save')")
@@ -62,7 +63,7 @@
if (!taskInstanceService.save(taskInstance)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(taskInstance);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(taskInstance));
}
@PreAuthorize("hasAuthority('system:taskInstance:update')")
@@ -74,7 +75,7 @@
if (!taskInstanceService.updateById(taskInstance)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(taskInstance);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(taskInstance));
}
@PreAuthorize("hasAuthority('system:taskInstance:remove')")
@@ -84,7 +85,7 @@
if (!taskInstanceService.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('system:taskInstance:list')")
@@ -98,13 +99,13 @@
taskInstanceService.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('system:taskInstance:list')")
@PostMapping("/taskInstance/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskInstanceService.list(), TaskInstance.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskInstanceService.list()), TaskInstance.class), response);
}
}
--
Gitblit v1.9.1