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/DictDataController.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
index fdf23e4..dcaa4d5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -15,8 +16,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
@@ -30,39 +32,49 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<DictData, BaseParam> pageParam = new PageParam<>(baseParam, DictData.class);
- return R.ok().add(dictDataService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:dictData:list')")
@PostMapping("/dictData/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(dictDataService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.list()));
}
@PreAuthorize("hasAuthority('system:dictData:list')")
@PostMapping({"/dictData/many/{ids}", "/dictDatas/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(dictDataService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:dictData:list')")
@GetMapping("/dictData/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(dictDataService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.getById(id)));
}
@PreAuthorize("hasAuthority('system:dictData:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/dictData/save")
public R save(@RequestBody DictData dictData) {
+ if (Objects.isNull(dictData.getLabel())) {
+ throw new CoolException("鍒悕涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(dictData.getValue())) {
+ throw new CoolException("鍊间笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(dictData.getDictTypeCode())) {
+ throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(dictData.getDictTypeId())) {
+ throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
+ }
dictData.setCreateBy(getLoginUserId());
- dictData.setCreateTime(new Date());
dictData.setUpdateBy(getLoginUserId());
- dictData.setUpdateTime(new Date());
if (!dictDataService.save(dictData)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(dictData);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(dictData));
}
@PreAuthorize("hasAuthority('system:dictData:update')")
@@ -74,7 +86,7 @@
if (!dictDataService.updateById(dictData)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(dictData);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(dictData));
}
@PreAuthorize("hasAuthority('system:dictData:remove')")
@@ -84,7 +96,7 @@
if (!dictDataService.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:dictData:list')")
@@ -98,13 +110,14 @@
dictDataService.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:dictData:list')")
@PostMapping("/dictData/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(dictDataService.list(), DictData.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(dictDataService.list()), DictData.class), response);
}
}
+
--
Gitblit v1.9.1