From b00f8a0bdccf0b0eed36f550e2c00176bfafe23f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 04 一月 2026 15:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index d042cb6..85da46e 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -1,18 +1,23 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.dto.ProductTreeDto;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.basic.service.IProductService;
+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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -82,4 +87,29 @@
}
return toAjax(productModelService.delProductModel(ids));
}
+
+ /**
+ * 鏍规嵁id鏌ヨ浜у搧瑙勬牸鍒嗛〉鏌ヨ
+ */
+ @GetMapping("/modelListPage")
+ public IPage<ProductModel> selectModelListPage(Page page, ProductDto productDto) {
+ return productModelService.modelListPage(page, productDto);
+ }
+
+ /**
+ * 瀵煎叆浜у搧
+ */
+ @Log(title = "瀵煎叆浜у搧",businessType = BusinessType.IMPORT)
+ @PostMapping("import")
+ public AjaxResult importProduct(MultipartFile file) {
+ return AjaxResult.success(productModelService.importProduct(file));
+ }
+ /**
+ * 浜у搧缁存姢-涓嬭浇浜у搧妯℃澘
+ */
+ @PostMapping("/downloadTemplate")
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<ProductModel> util = new ExcelUtil<>(ProductModel.class);
+ util.importTemplateExcel(response, "浜у搧瑙勬牸妯℃澘");
+ }
}
--
Gitblit v1.9.3