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/DictTypeController.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
index fbeb7d9..c5019da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.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,25 +32,25 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<DictType, BaseParam> pageParam = new PageParam<>(baseParam, DictType.class);
- return R.ok().add(dictTypeService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictTypeService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:dictType:list')")
@PostMapping("/dictType/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(dictTypeService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictTypeService.list()));
}
@PreAuthorize("hasAuthority('system:dictType:list')")
@PostMapping({"/dictType/many/{ids}", "/dictTypes/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(dictTypeService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictTypeService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:dictType:list')")
@GetMapping("/dictType/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(dictTypeService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictTypeService.getById(id)));
}
@PreAuthorize("hasAuthority('system:dictType:save')")
@@ -56,25 +58,37 @@
@PostMapping("/dictType/save")
public R save(@RequestBody DictType dictType) {
dictType.setCreateBy(getLoginUserId());
- dictType.setCreateTime(new Date());
dictType.setUpdateBy(getLoginUserId());
- dictType.setUpdateTime(new Date());
+ if (Objects.isNull(dictType.getName())) {
+ throw new CoolException("瀛楀吀鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(dictType.getCode())) {
+ throw new CoolException("瀛楀吀缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!dictTypeService.list(new LambdaQueryWrapper<DictType>().eq(DictType::getCode, dictType.getCode())).isEmpty()) {
+ throw new CoolException("缂栫爜涓嶈兘閲嶅锛侊紒");
+ }
+ if (!dictTypeService.list(new LambdaQueryWrapper<DictType>().eq(DictType::getName, dictType.getName())).isEmpty()) {
+ throw new CoolException("鍚嶇О涓嶈兘閲嶅锛侊紒");
+ }
if (!dictTypeService.save(dictType)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(dictType);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(dictType));
}
@PreAuthorize("hasAuthority('system:dictType:update')")
@OperationLog("Update 鏁版嵁瀛楀吀")
@PostMapping("/dictType/update")
public R update(@RequestBody DictType dictType) {
+ if (Objects.isNull(dictType)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
dictType.setUpdateBy(getLoginUserId());
- dictType.setUpdateTime(new Date());
if (!dictTypeService.updateById(dictType)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(dictType);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(dictType));
}
@PreAuthorize("hasAuthority('system:dictType:remove')")
@@ -84,7 +98,7 @@
if (!dictTypeService.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:dictType:list')")
@@ -98,13 +112,14 @@
dictTypeService.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('system:dictType:list')")
@PostMapping("/dictType/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(dictTypeService.list(), DictType.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(dictTypeService.list()), DictType.class), response);
}
}
+
--
Gitblit v1.9.1