From 81c1c406ecb5cf4d32dfe08c89f9a6b7ecd750db Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sun, 27 Apr 2025 23:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ComponentSearchController.java    | 16 +++++++---------
 .../service/impl/ComponentSearchServiceImpl.java |  6 ++++--
 2 files changed, 11 insertions(+), 11 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 e5a8e4e..7e47a40 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
@@ -77,19 +77,17 @@ public class ComponentSearchController {
     @Operation(summary = "器件搜索数据-添加")
     // @RequiresPermissions("database:document_favorites:add")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody SearchRequest searchRequest, HttpServletRequest request) {
+    public Result<String> add(@RequestBody SearchResult searchResult, HttpServletRequest request) {
         String username = JwtUtil.getUserNameByToken(request);
         SysUser userByName = userService.getUserByName(username);
-        SearchResult result = new SearchResult();
-        result.setContent(searchRequest.getContent());
-        result.setDataType(searchRequest.getType());
+
         Date currentDate = new Date();
-        result.setCreateTime(currentDate);
-        result.setUpdateTime(currentDate);
-        result.setCreateBy(userByName.getId());
-        result.setUpdateBy(userByName.getId());
+        searchResult.setCreateTime(currentDate);
+        searchResult.setUpdateTime(currentDate);
+        searchResult.setCreateBy(userByName.getId());
+        searchResult.setUpdateBy(userByName.getId());
         try {
-            componentSearchService.saveComponentSearch(result);
+            componentSearchService.saveComponentSearch(searchResult);
         }catch (JeecgBootException e) {
             return Result.error(e.getMessage());
         }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java
index 0bf13f9..e632864 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java
@@ -83,11 +83,11 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
                if (StringUtil.isNotEmpty(sampleInfo.getSampleBatch())){
                    LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
                    queryWrapper.eq(SearchResult::getDataType,  ComponentSearchType.MODEL_BATCH_NO.getCode());
-                   queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getModelBatch().trim());
+                   queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleBatch().trim());
                    if (0L == this.count(queryWrapper)){
                        SearchResult modelBatchNoRecord = new SearchResult();
                        modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
-                       modelBatchNoRecord.setContent(sampleInfo.getModelBatch());
+                       modelBatchNoRecord.setContent(sampleInfo.getSampleBatch());
                        try {
                            saveOrUpdate(modelBatchNoRecord);
                        }catch (Exception e) {
@@ -102,6 +102,8 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
 
     @Override
     public boolean saveComponentSearch(SearchResult searchResult) {
+        logger.info(searchResult.toString());
+
         LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SearchResult::getDataType,  searchResult.getDataType());
         queryWrapper.eq(SearchResult::getContent, searchResult.getContent());