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/ReviseLogController.java | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
index 0f46aea..61d9911 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
@@ -4,19 +4,23 @@
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.ReviseLogParams;
import com.vincent.rsf.server.manager.entity.ReviseLog;
import com.vincent.rsf.server.manager.service.ReviseLogService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
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
@@ -25,33 +29,34 @@
@Autowired
private ReviseLogService reviseLogService;
- @PreAuthorize("hasAuthority('manager:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLog/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<ReviseLog, BaseParam> pageParam = new PageParam<>(baseParam, ReviseLog.class);
- return R.ok().add(reviseLogService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<ReviseLog, BaseParam> page = reviseLogService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLog/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(reviseLogService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogService.list()));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping({"/reviseLog/many/{ids}", "/reviseLogs/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(reviseLogService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogService.listByIds(Arrays.asList(ids))));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@GetMapping("/reviseLog/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(reviseLogService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogService.getById(id)));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:save')")
+ @PreAuthorize("hasAuthority('manager:locRevise:save')")
@OperationLog("Create 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLog/save")
public R save(@RequestBody ReviseLog reviseLog) {
@@ -62,10 +67,11 @@
if (!reviseLogService.save(reviseLog)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(reviseLog);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(reviseLog));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:update')")
+
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
@OperationLog("Update 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLog/update")
public R update(@RequestBody ReviseLog reviseLog) {
@@ -74,20 +80,40 @@
if (!reviseLogService.updateById(reviseLog)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(reviseLog);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(reviseLog));
}
- @PreAuthorize("hasAuthority('manager:reviseLog:remove')")
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
+ @OperationLog("save 搴撳瓨璋冩暣鏄庣粏")
+ @PostMapping("/reviseLog/items/save")
+ public R update(@RequestBody ReviseLogParams reviseLog) {
+ if (Objects.isNull(reviseLog)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok().add(buildPageRowsUtils.rowsMap(reviseLogService.reviseLoc(reviseLog, getLoginUserId())));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
+ @PostMapping("/reviseLog/complete/{id}")
+ @ApiOperation("纭璋冩暣搴撳瓨")
+ public R completeTran(@PathVariable("id") Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return reviseLogService.complete(id, getLoginUserId());
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:remove')")
@OperationLog("Delete 搴撲綅璋冩暣鍘嗗彶")
@PostMapping("/reviseLog/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!reviseLogService.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:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLog/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -98,13 +124,13 @@
reviseLogService.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:reviseLog:list')")
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/reviseLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(reviseLogService.list(), ReviseLog.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(reviseLogService.list()), ReviseLog.class), response);
}
}
--
Gitblit v1.9.1