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/TaskPathTemplateMergeController.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
index 84ddd58..53a9205 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -15,8 +15,9 @@
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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -36,45 +37,55 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskPathTemplateMerge, BaseParam> pageParam = new PageParam<>(baseParam, TaskPathTemplateMerge.class);
- return R.ok().add(taskPathTemplateMergeService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
@PostMapping("/taskPathTemplateMerge/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskPathTemplateMergeService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.list()));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
@PostMapping({"/taskPathTemplateMerge/many/{ids}", "/taskPathTemplateMerges/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(taskPathTemplateMergeService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:list')")
@GetMapping("/taskPathTemplateMerge/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskPathTemplateMergeService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.getById(id)));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:save')")
@OperationLog("Create 鐗╂枡鏉冮檺")
@PostMapping("/taskPathTemplateMerge/save")
- public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerge) {
- taskPathTemplateMerge.setCreateBy(getLoginUserId());
- taskPathTemplateMerge.setCreateTime(new Date());
- taskPathTemplateMerge.setUpdateBy(getLoginUserId());
- taskPathTemplateMerge.setUpdateTime(new Date());
- if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
- return R.error();
+ public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerges) {
+ List<String> sourceTypeR = taskPathTemplateMerges.getSourceTypeR();
+ List<String> targetTypeR = taskPathTemplateMerges.getTargetTypeR();
+ for (String sourceType : sourceTypeR) {
+ for (String targetType : targetTypeR) {
+ TaskPathTemplateMerge taskPathTemplateMerge = new TaskPathTemplateMerge();
+ taskPathTemplateMerge.setConditionExpression(taskPathTemplateMerges.getConditionExpression());
+ taskPathTemplateMerge.setSourceType(sourceType);
+ taskPathTemplateMerge.setTargetType(targetType);
+ taskPathTemplateMerge.setCreateBy(getLoginUserId());
+ taskPathTemplateMerge.setCreateTime(new Date());
+ taskPathTemplateMerge.setUpdateBy(getLoginUserId());
+ taskPathTemplateMerge.setUpdateTime(new Date());
+ if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
+ return R.error();
+ }
+ String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
+ taskPathTemplateMerge.setTemplateName(name);
+ taskPathTemplateMerge.setTemplateCode(name);
+ if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
+ return R.error("Save Fail");
+ }
+ }
}
- String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
- taskPathTemplateMerge.setTemplateName(name);
- taskPathTemplateMerge.setTemplateCode(name);
- if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
- return R.error("Save Fail");
- }
- return R.ok("Save Success").add(taskPathTemplateMerge);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(taskPathTemplateMerges));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:update')")
@@ -86,7 +97,7 @@
if (!taskPathTemplateMergeService.updateById(taskPathTemplateMerge)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(taskPathTemplateMerge);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(taskPathTemplateMerge));
}
@PreAuthorize("hasAuthority('system:taskPathTemplateMerge:remove')")
@@ -96,7 +107,7 @@
if (!taskPathTemplateMergeService.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:taskPathTemplateMerge:list')")
@@ -110,13 +121,14 @@
taskPathTemplateMergeService.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:taskPathTemplateMerge:list')")
@PostMapping("/taskPathTemplateMerge/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskPathTemplateMergeService.list(), TaskPathTemplateMerge.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskPathTemplateMergeService.list()), TaskPathTemplateMerge.class), response);
}
}
+
--
Gitblit v1.9.1