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/LocTypeController.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
index f0332ef..0a6689d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -11,15 +11,20 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocType;
+import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.LocTypeService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "搴撲綅绫诲瀷")
@RestController
public class LocTypeController extends BaseController {
@@ -31,25 +36,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocType, BaseParam> pageParam = new PageParam<>(baseParam, LocType.class);
- return R.ok().add(locTypeService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocType, BaseParam> page = locTypeService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:locType:list')")
@PostMapping("/locType/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(locTypeService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.list()));
}
@PreAuthorize("hasAuthority('manager:locType:list')")
@PostMapping({"/locType/many/{ids}", "/locTypes/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(locTypeService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:locType:list')")
@GetMapping("/locType/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locTypeService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locTypeService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:locType:save')")
@@ -65,17 +71,30 @@
if (Objects.isNull(locType.getRegex())) {
throw new CoolException("搴撲綅瑙勫垯琛ㄨ揪寮忎笉鑳戒负绌猴紒锛�");
}
+
locType.setCreateBy(getLoginUserId());
locType.setUpdateBy(getLoginUserId());
+ List<LocType> list = locTypeService.list(new LambdaQueryWrapper<LocType>()
+ .eq(LocType::getCode, locType.getCode()));
+ if (!list.isEmpty()) {
+ throw new CoolException("缂栫爜涓嶈兘閲嶅锛侊紒");
+ }
+ List<LocType> groups = locTypeService.list(new LambdaQueryWrapper<LocType>()
+ .eq(LocType::getName, locType.getName()));
+ if (!groups.isEmpty()) {
+ throw new CoolException("鍚嶇О宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+ }
+
if (!locTypeService.save(locType)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(locType);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locType));
}
@PreAuthorize("hasAuthority('manager:locType:update')")
@OperationLog("Update loc type")
@PostMapping("/locType/update")
+ @Transactional(rollbackFor = Exception.class)
public R update(@RequestBody LocType locType) {
if (Objects.isNull(locType.getName())) {
throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
@@ -86,11 +105,25 @@
if (Objects.isNull(locType.getRegex())) {
throw new CoolException("搴撲綅瑙勫垯琛ㄨ揪寮忎笉鑳戒负绌猴紒锛�");
}
+
+ LocType locType1 = locTypeService.getById(locType.getId());
+ if (!locType.getName().equals(locType1.getName())) {
+ List<LocType> areasList = locTypeService.list(new LambdaQueryWrapper<LocType>().eq(LocType::getName, locType.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ }
+ }
+ if (!locType.getCode().equals(locType1.getCode())) {
+ List<LocType> locTypeList = locTypeService.list(new LambdaQueryWrapper<LocType>().eq(LocType::getCode, locType.getCode()));
+ if (!locTypeList.isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
locType.setUpdateBy(getLoginUserId());
if (!locTypeService.updateById(locType)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(locType);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locType));
}
@PreAuthorize("hasAuthority('manager:locType:remove')")
@@ -100,7 +133,7 @@
if (!locTypeService.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:locType:list')")
@@ -114,13 +147,13 @@
locTypeService.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:locType:list')")
@PostMapping("/locType/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locTypeService.list(), LocType.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locTypeService.list()), LocType.class), response);
}
}
--
Gitblit v1.9.1