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/manager/controller/WaveRuleController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
index 91072c0..3570373 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
@@ -11,12 +11,16 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.WaveRule;
import com.vincent.rsf.server.manager.service.WaveRuleService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
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 +34,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaveRule, BaseParam> pageParam = new PageParam<>(baseParam, WaveRule.class);
- return R.ok().add(waveRuleService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaveRule, BaseParam> page = waveRuleService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:waveRule:list')")
@PostMapping("/waveRule/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waveRuleService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveRuleService.list()));
}
@PreAuthorize("hasAuthority('manager:waveRule:list')")
@PostMapping({"/waveRule/many/{ids}", "/waveRules/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waveRuleService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveRuleService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waveRule:list')")
@GetMapping("/waveRule/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waveRuleService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveRuleService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waveRule:save')")
@@ -59,10 +64,14 @@
waveRule.setCreateTime(new Date());
waveRule.setUpdateBy(getLoginUserId());
waveRule.setUpdateTime(new Date());
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_RULE_CODE, null);
+ if (!StringUtils.isBlank(ruleCode)) {
+ waveRule.setCode(ruleCode);
+ }
if (!waveRuleService.save(waveRule)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waveRule);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waveRule));
}
@PreAuthorize("hasAuthority('manager:waveRule:update')")
@@ -74,7 +83,7 @@
if (!waveRuleService.updateById(waveRule)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waveRule);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waveRule));
}
@PreAuthorize("hasAuthority('manager:waveRule:remove')")
@@ -84,7 +93,7 @@
if (!waveRuleService.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:waveRule:list')")
@@ -98,13 +107,13 @@
waveRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getName()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:waveRule:list')")
@PostMapping("/waveRule/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waveRuleService.list(), WaveRule.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waveRuleService.list()), WaveRule.class), response);
}
}
--
Gitblit v1.9.1