physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新搜索数据时先判断是否有数据

Browse Source
This commit is contained in:
dengchun
2025-04-27 00:03:30 +08:00
parent 96fd42280c
commit 7510cec570
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.jeecg.modules.database.service.impl; package org.jeecg.modules.database.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jodd.util.StringUtil; import jodd.util.StringUtil;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.constant.ComponentSearchType; import org.jeecg.modules.database.constant.ComponentSearchType;
import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.entity.Experiment; import org.jeecg.modules.database.entity.Experiment;
import org.jeecg.modules.database.entity.SearchResult; import org.jeecg.modules.database.entity.SearchResult;
import org.jeecg.modules.database.mapper.ComponentSearchMapper; import org.jeecg.modules.database.mapper.ComponentSearchMapper;
@@ -38,11 +40,11 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
@Override @Override
public List<SearchResult> search(Integer type, String content) { public List<SearchResult> search(Integer type, String content) {
SearchResult searchResult = new SearchResult();
Map requestMap = new HashMap(); LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
requestMap.put("dataType", type); queryWrapper.eq(SearchResult::getDataType, type);
requestMap.put("content", content); queryWrapper.likeRight(SearchResult::getContent, content);
QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
return this.list(queryWrapper); return this.list(queryWrapper);
} }
@@ -52,12 +54,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
if (CollUtil.isNotEmpty(experiment.getSampleInfoList())) { if (CollUtil.isNotEmpty(experiment.getSampleInfoList())) {
experiment.getSampleInfoList().forEach(sampleInfo -> { experiment.getSampleInfoList().forEach(sampleInfo -> {
if (StringUtil.isNotEmpty(sampleInfo.getSampleModel())) { if (StringUtil.isNotEmpty(sampleInfo.getSampleModel())) {
SearchResult searchResult = new SearchResult(); LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
Map requestMap = new HashMap(); queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_NUMBER.getCode());
requestMap.put("dataType", ComponentSearchType.MODEL_NUMBER.getCode()); queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleModel().trim());
requestMap.put("content", sampleInfo.getSampleModel().trim());
QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
if (0L == this.count(queryWrapper)){ if (0L == this.count(queryWrapper)){
SearchResult modelNumberRecord = new SearchResult(); SearchResult modelNumberRecord = new SearchResult();
modelNumberRecord.setDataType(ComponentSearchType.MODEL_NUMBER.getCode()); modelNumberRecord.setDataType(ComponentSearchType.MODEL_NUMBER.getCode());
@@ -71,12 +70,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
} }
if (StringUtil.isNotEmpty(sampleInfo.getSampleName())) { if (StringUtil.isNotEmpty(sampleInfo.getSampleName())) {
SearchResult searchResult = new SearchResult(); LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
Map requestMap = new HashMap(); queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_NAME.getCode());
requestMap.put("dataType", ComponentSearchType.MODEL_NAME.getCode()); queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleName().trim());
requestMap.put("content", sampleInfo.getSampleName().trim());
QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
if (0L == this.count(queryWrapper)){ if (0L == this.count(queryWrapper)){
SearchResult modelNameRecord = new SearchResult(); SearchResult modelNameRecord = new SearchResult();
modelNameRecord.setDataType(ComponentSearchType.MODEL_NAME.getCode()); modelNameRecord.setDataType(ComponentSearchType.MODEL_NAME.getCode());
@@ -90,11 +86,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
} }
if (StringUtil.isNotEmpty(sampleInfo.getModelBatch())){ if (StringUtil.isNotEmpty(sampleInfo.getModelBatch())){
SearchResult searchResult = new SearchResult(); LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
Map requestMap = new HashMap(); queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_BATCH_NO.getCode());
requestMap.put("dataType", ComponentSearchType.MODEL_BATCH_NO.getCode()); queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getModelBatch().trim());
requestMap.put("content", sampleInfo.getModelBatch().trim());
QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
if (0L == this.count(queryWrapper)){ if (0L == this.count(queryWrapper)){
SearchResult modelBatchNoRecord = new SearchResult(); SearchResult modelBatchNoRecord = new SearchResult();
modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode()); modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());