From bfdae0e0f05c3f6aab0905aff037e39e212053d8 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Thu, 1 May 2025 08:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ComponentSearchController.java | 37 +++++++++++++++----
 .../modules/database/entity/SearchResult.java |  2 +
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java
index 7e47a40..5aab605 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java
@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.api.vo.SearchRequest;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.entity.SearchResult;
 import org.jeecg.modules.database.service.IComponentSearchService;
@@ -17,6 +18,7 @@ import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Date;
 import java.util.List;
@@ -24,7 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/database/componentSearch")
 @Slf4j
-public class ComponentSearchController {
+public class ComponentSearchController extends JeecgController<SearchResult, IComponentSearchService> {
     @Autowired
     private IComponentSearchService componentSearchService;
 
@@ -55,10 +57,6 @@ public class ComponentSearchController {
 
     /**
      * 模糊搜索接口
-     * @return
-     */
-    /**
-     *
      * @param type
      * @param content
      * @return
@@ -133,7 +131,32 @@ public class ComponentSearchController {
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
         componentSearchService.removeById(id);
-        return Result.OK("删除!");
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param result
+     */
+
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SearchResult result) {
+        return super.exportXls(request, result, SearchResult.class, "样品类型信息");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+   // @RequiresPermissions("database:experiment:add")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SearchResult.class);
     }
 
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/SearchResult.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/SearchResult.java
index 4203d08..b8c2cf5 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/SearchResult.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/SearchResult.java
@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -60,6 +61,7 @@ public class SearchResult implements Serializable {
     /**
      * 搜索的内容
      */
+    @Excel(name = "内容", width = 15)
     @Schema(description = "搜索内容")
     private String content;