From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/OrderLogController.java | 43 +++++++++----------------------------------
1 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/OrderLogController.java b/server/admin/src/main/java/com/doumee/api/business/OrderLogController.java
index 967a5f6..22fbf52 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrderLogController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrderLogController.java
@@ -1,8 +1,6 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -14,13 +12,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * 璁㈠崟鎿嶄綔鏃ュ織
+ * @author rk
+ * @date 2026/04/13
*/
@Api(tags = "璁㈠崟鎿嶄綔鏃ュ織")
@RestController
@@ -30,17 +28,9 @@
@Autowired
private OrderLogService orderLogService;
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:orderlog:create")
- public ApiResponse create(@RequestBody OrderLog orderLog) {
- return ApiResponse.success(orderLogService.create(orderLog));
- }
-
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:orderlog:delete")
+ @RequiresPermissions("business:orderLog:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
orderLogService.deleteById(id);
return ApiResponse.success(null);
@@ -48,9 +38,9 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:orderlog:delete")
+ @RequiresPermissions("business:orderLog:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
+ String[] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
idList.add(Integer.valueOf(id));
@@ -59,31 +49,16 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:orderlog:update")
- public ApiResponse updateById(@RequestBody OrderLog orderLog) {
- orderLogService.updateById(orderLog);
- return ApiResponse.success(null);
- }
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:orderlog:query")
- public ApiResponse<PageData<OrderLog>> findPage (@RequestBody PageWrap<OrderLog> pageWrap) {
+ @RequiresPermissions("business:orderLog:query")
+ public ApiResponse<PageData<OrderLog>> findPage(@RequestBody PageWrap<OrderLog> pageWrap) {
return ApiResponse.success(orderLogService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:orderlog:exportExcel")
- public void exportExcel (@RequestBody PageWrap<OrderLog> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(OrderLog.class).export(orderLogService.findPage(pageWrap).getRecords(), "璁㈠崟鎿嶄綔鏃ュ織", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("business:orderlog:query")
+ @RequiresPermissions("business:orderLog:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(orderLogService.findById(id));
}
--
Gitblit v1.9.3