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/ReviseLogItemController.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
index 606d4a6..1265498 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
@@ -4,54 +4,60 @@
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;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
import com.vincent.rsf.server.manager.entity.ReviseLogItem;
import com.vincent.rsf.server.manager.service.ReviseLogItemService;
+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.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
+@Api("搴撳瓨璋冩暣鍘嗗彶")
@RestController
public class ReviseLogItemController extends BaseController {
@Autowired
private ReviseLogItemService reviseLogItemService;
- @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLogItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<ReviseLogItem, BaseParam> pageParam = new PageParam<>(baseParam, ReviseLogItem.class);
- return R.ok().add(reviseLogItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<ReviseLogItem, BaseParam> page = reviseLogItemService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLogItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(reviseLogItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogItemService.list()));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping({"/reviseLogItem/many/{ids}", "/reviseLogItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(reviseLogItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogItemService.listByIds(Arrays.asList(ids))));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@GetMapping("/reviseLogItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(reviseLogItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogItemService.getById(id)));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:save')")
+ @PreAuthorize("hasAuthority('manager:locRevise:save')")
@OperationLog("Create 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLogItem/save")
public R save(@RequestBody ReviseLogItem reviseLogItem) {
@@ -62,10 +68,23 @@
if (!reviseLogItemService.save(reviseLogItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(reviseLogItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(reviseLogItem));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:update')")
+ @PreAuthorize("hasAuthority('manager:locRevise:save')")
+ @OperationLog("Create 搴撲綅璋冩暣鍘嗗彶")
+ @PostMapping("/reviseLogItem/items/save")
+ public R itemSave(@RequestBody ReviseLogItemParams reviseLogItem) {
+ if (Objects.isNull(reviseLogItem.getReviseLogId())) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(reviseLogItem.getItems()) || reviseLogItem.getItems().isEmpty()) {
+ throw new CoolException("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogItemService.itemSave(reviseLogItem, getLoginUserId())));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
@OperationLog("Update 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLogItem/update")
public R update(@RequestBody ReviseLogItem reviseLogItem) {
@@ -74,20 +93,20 @@
if (!reviseLogItemService.updateById(reviseLogItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(reviseLogItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(reviseLogItem));
}
- @PreAuthorize("hasAuthority('manager:reviseLogItem:remove')")
+ @PreAuthorize("hasAuthority('manager:locRevise:remove')")
@OperationLog("Delete 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLogItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!reviseLogItemService.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:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLogItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -98,13 +117,13 @@
reviseLogItemService.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('manager:reviseLogItem:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLogItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(reviseLogItemService.list(), ReviseLogItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(reviseLogItemService.list()), ReviseLogItem.class), response);
}
}
--
Gitblit v1.9.1