From 529447f27a39aae29c2056e176d2362ff99d0d81 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sat, 26 Apr 2025 23:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 .../impl/ComponentSearchServiceImpl.java      | 75 +++++++++++++------
 2 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index aa1a4d3..783112a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ pnpm run build
 
 # 后端发布
 ## 测试环境
-docker compose pull
+docker compose pull 
 docker compose up -d
 
 # 数据库地址
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 af082a7..f62a7b0 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jodd.util.StringUtil;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.database.constant.ComponentSearchType;
 import org.jeecg.modules.database.entity.Experiment;
@@ -50,32 +51,62 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
         // 批量更新样品型号,样品名称，样品批次
         if (CollUtil.isNotEmpty(experiment.getSampleInfoList())) {
             experiment.getSampleInfoList().forEach(sampleInfo -> {
-                SearchResult modelNumberRecord = new SearchResult();
-                modelNumberRecord.setDataType(ComponentSearchType.MODEL_NUMBER.getCode());
-                modelNumberRecord.setContent(sampleInfo.getSampleModel());
-                try {
-                    saveOrUpdate(modelNumberRecord);
-                }catch (Exception e) {
-                    logger.warn("样品型号搜索数据更新失败,错误信息: " + e.getMessage());
+                if (StringUtil.isNotEmpty(sampleInfo.getSampleModel())) {
+                    SearchResult searchResult = new SearchResult();
+                    Map requestMap = new HashMap();
+                    requestMap.put("dataType", ComponentSearchType.MODEL_NUMBER.getCode());
+                    requestMap.put("content", sampleInfo.getSampleModel().trim());
+                    QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
+
+                    if (null == this.getOne(queryWrapper)){
+                        SearchResult modelNumberRecord = new SearchResult();
+                        modelNumberRecord.setDataType(ComponentSearchType.MODEL_NUMBER.getCode());
+                        modelNumberRecord.setContent(sampleInfo.getSampleModel().trim());
+                        try {
+                            saveOrUpdate(modelNumberRecord);
+                        }catch (Exception e) {
+                            logger.warn("样品型号搜索数据更新失败,错误信息: " + e.getMessage());
+                        }
+                    }
                 }
 
-                SearchResult modelNameRecord = new SearchResult();
-                modelNameRecord.setDataType(ComponentSearchType.MODEL_NAME.getCode());
-                modelNameRecord.setContent(sampleInfo.getSampleName());
-                try {
-                    updateById(modelNameRecord);
-                }catch (Exception e) {
-                    logger.warn("样品名称搜索数据更新失败,错误信息: " + e.getMessage());
+                if (StringUtil.isNotEmpty(sampleInfo.getSampleName())) {
+                    SearchResult searchResult = new SearchResult();
+                    Map requestMap = new HashMap();
+                    requestMap.put("dataType", ComponentSearchType.MODEL_NAME.getCode());
+                    requestMap.put("content", sampleInfo.getSampleName().trim());
+                    QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
+
+                    if (null == this.getOne(queryWrapper)){
+                        SearchResult modelNameRecord = new SearchResult();
+                        modelNameRecord.setDataType(ComponentSearchType.MODEL_NAME.getCode());
+                        modelNameRecord.setContent(sampleInfo.getSampleName());
+                        try {
+                            updateById(modelNameRecord);
+                        }catch (Exception e) {
+                            logger.warn("样品名称搜索数据更新失败,错误信息: " + e.getMessage());
+                        }
+                    }
                 }
 
-                SearchResult modelBatchNoRecord = new SearchResult();
-                modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
-                modelBatchNoRecord.setContent(sampleInfo.getModelBatch());
-                try {
-                    updateById(modelBatchNoRecord);
-                }catch (Exception e) {
-                    logger.warn("样品批次搜索数据更新失败,错误信息: " + e.getMessage());
-                }
+               if (StringUtil.isNotEmpty(sampleInfo.getModelBatch())){
+                   SearchResult searchResult = new SearchResult();
+                   Map requestMap = new HashMap();
+                   requestMap.put("dataType", ComponentSearchType.MODEL_BATCH_NO.getCode());
+                   requestMap.put("content", sampleInfo.getModelBatch().trim());
+                   QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
+                   if (null == this.getOne(queryWrapper)){
+                       SearchResult modelBatchNoRecord = new SearchResult();
+                       modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
+                       modelBatchNoRecord.setContent(sampleInfo.getModelBatch());
+                       try {
+                           updateById(modelBatchNoRecord);
+                       }catch (Exception e) {
+                           logger.warn("样品批次搜索数据更新失败,错误信息: " + e.getMessage());
+                       }
+                   }
+               }
+
             });
         }
     }