From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index be5f92a..9aa6570 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -9,10 +10,12 @@
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.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -31,8 +34,9 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public IPage<Customer> list(Page page, Customer customer) {
- return customerService.selectCustomerList(page, customer);
+ public R list(Page<CustomerDto> page, CustomerDto customer) {
+ IPage<CustomerDto> customerDtoIPage = customerService.selectCustomerList(page, customer);
+ return R.ok(customerDtoIPage);
}
/**
@@ -52,12 +56,30 @@
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
}
+ @PostMapping("/downloadTemplate")
+ @Log(title = "瀹㈡埛妗ｆ-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ util.importTemplateExcel(response, "瀹㈡埛妗ｆ妯℃澘");
+ }
+
+
+ /**
+ * 瀵煎叆瀹㈡埛妗ｆ
+ */
+ @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+
+ return customerService.importData(file);
+ }
+
/**
* 鑾峰彇瀹㈡埛妗ｆ璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(customerService.selectCustomerById(id));
+ return success(customerService.selectCustomerDetailById(id));
}
/**
@@ -97,4 +119,6 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
+
}
--
Gitblit v1.9.3