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/TaskLogController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
index 6d6ec3a..0a2396b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
@@ -11,12 +11,13 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.TaskLog;
import com.vincent.rsf.server.manager.service.TaskLogService;
+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,27 +31,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
-// PageParam<TaskLog, BaseParam> logs = taskLogService.page(pageParam, pageParam.buildWrapper(true));
- return R.ok(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
-// return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<TaskLog, BaseParam> page = taskLogService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:taskLog:list')")
@PostMapping("/taskLog/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskLogService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskLogService.list()));
}
@PreAuthorize("hasAuthority('manager:taskLog:list')")
@PostMapping({"/taskLog/many/{ids}", "/taskLogs/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(taskLogService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskLogService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:taskLog:list')")
@GetMapping("/taskLog/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskLogService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskLogService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:taskLog:save')")
@@ -64,7 +64,7 @@
if (!taskLogService.save(taskLog)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(taskLog);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(taskLog));
}
@PreAuthorize("hasAuthority('manager:taskLog:update')")
@@ -76,7 +76,7 @@
if (!taskLogService.updateById(taskLog)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(taskLog);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(taskLog));
}
@PreAuthorize("hasAuthority('manager:taskLog:remove')")
@@ -86,7 +86,7 @@
if (!taskLogService.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:taskLog:list')")
@@ -100,13 +100,13 @@
taskLogService.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:taskLog:list')")
@PostMapping("/taskLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskLogService.list(), TaskLog.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskLogService.list()), TaskLog.class), response);
}
}
--
Gitblit v1.9.1