From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
index 4c75ffd..49284de 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
@@ -1,26 +1,31 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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.CursorPageParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
-import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
+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
public class AsnOrderLogController extends BaseController {
+
+ private static final int DEFAULT_CURSOR_PAGE_SIZE = 20;
@Autowired
private AsnOrderLogService asnOrderLogService;
@@ -28,27 +33,45 @@
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@PostMapping("/asnOrderLog/page")
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderLog, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderLog.class);
- return R.ok().add(asnOrderLogService.page(pageParam, pageParam.buildWrapper(true)));
+ // 杩欓噷宸茬粡涓嶅啀鎵嬪啓娓告爣鍒嗛〉缁嗚妭锛岃�屾槸鐩存帴澶嶇敤 BaseController 鐨勯�氱敤瀹炵幇銆�
+ //
+ // 褰撳墠杩欏嚑涓弬鏁板垎鍒〃杈撅細
+ // 1. map锛氬墠绔師濮嬭姹傚弬鏁�
+ // 2. CursorPageParam.class锛氶�氱敤娓告爣鍙傛暟瑙ｆ瀽鍣�
+ // 3. AsnOrderLog.class锛氱敤浜庨�氱敤绛涢�夊拰 condition 妯＄硦鎼滅储
+ // 4. asnOrderLogService锛氬疄闄呮墽琛屾煡璇㈢殑 service
+ // 5. "id"锛氭湰鎺ュ彛鐨勬父鏍囧瓧娈碉紝鍥哄畾鎸� id desc 鍋氬垎椤�
+ // 6. DEFAULT_CURSOR_PAGE_SIZE锛氶粯璁ゆ瘡椤靛ぇ灏�
+ // 7. null锛氬綋鍓嶆病鏈夐澶栫殑 where 鏉′欢鎵╁睍
+ // 8. buildPageRowsUtils::userNameMap锛氱粨鏋滃悗澶勭悊锛屾壒閲忚ˉ createBy$/updateBy$
+ return R.ok().add(cursorPage(
+ map,
+ CursorPageParam.class,
+ AsnOrderLog.class,
+ asnOrderLogService,
+ "id",
+ DEFAULT_CURSOR_PAGE_SIZE,
+ null,
+ buildPageRowsUtils::userNameMap
+ ));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@PostMapping("/asnOrderLog/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(asnOrderLogService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderLogService.list()));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@PostMapping({"/asnOrderLog/many/{ids}", "/asnOrderLogs/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderLogService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderLogService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@GetMapping("/asnOrderLog/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderLogService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderLogService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:save')")
@@ -62,7 +85,7 @@
if (!asnOrderLogService.save(asnOrderLog)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(asnOrderLog);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(asnOrderLog));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:update')")
@@ -74,7 +97,7 @@
if (!asnOrderLogService.updateById(asnOrderLog)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrderLog);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(asnOrderLog));
}
@PreAuthorize("hasAuthority('manager:asnOrderLog:remove')")
@@ -84,7 +107,7 @@
if (!asnOrderLogService.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:asnOrderLog:list')")
@@ -98,13 +121,34 @@
asnOrderLogService.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:asnOrderLog:list')")
@PostMapping("/asnOrderLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(asnOrderLogService.list(), AsnOrderLog.class), response);
+ List<AsnOrderLog> orders = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<AsnOrderLog>().in(AsnOrderLog::getId, ids));
+ } else {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<>());
+ }
+ } else {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<>());
+ }
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orders), AsnOrderLog.class), response);
+ }
+
+ @ApiOperation("缁х画鏀惰揣")
+ @PreAuthorize("hasAuthority('manager:asnOrderLog:update')")
+ @PostMapping("/asnOrderLog/continue/{id}")
+ public R continuRcpt(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderLogService.continueRecipt(id);
}
}
--
Gitblit v1.9.1