From 3b2da9fbba7117514c9c52ab68977977ad205e86 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 15:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 102517c..be5f92a 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -1,25 +1,19 @@
package com.ruoyi.basic.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 瀹㈡埛妗ｆController
@@ -37,10 +31,8 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(Customer customer) {
- startPage();
- List<Customer> list = customerService.selectCustomerList(customer);
- return getDataTable(list);
+ public IPage<Customer> list(Page page, Customer customer) {
+ return customerService.selectCustomerList(page, customer);
}
/**
@@ -54,8 +46,7 @@
if (ids != null && ids.length > 0) {
list = customerService.selectCustomerListByIds(ids);
} else {
-
- list = customerService.selectCustomerList(customer);
+ list = customerService.selectCustomerLists(customer);
}
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
@@ -82,7 +73,7 @@
* 淇敼瀹㈡埛妗ｆ
*/
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.UPDATE)
- @PutMapping ("/updateCustomer")
+ @PostMapping("/updateCustomer")
public AjaxResult edit(@RequestBody Customer customer) {
return toAjax(customerService.updateCustomer(customer));
}
@@ -91,8 +82,19 @@
* 鍒犻櫎瀹㈡埛妗ｆ
*/
@Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
+ @DeleteMapping("/delCustomer")
+ public AjaxResult remove(@RequestBody Long[] ids) {
+ if (ids == null || ids.length == 0) {
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ }
return toAjax(customerService.deleteCustomerByIds(ids));
}
+
+ /**
+ * 鏌ヨ瀹㈡埛
+ */
+ @GetMapping("/customerList")
+ public List customerList(Customer customer) {
+ return customerService.customerList(customer);
+ }
}
--
Gitblit v1.9.3