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 { - 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 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 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 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()); + } + } + } + }); } }