更新搜索数据时先判断是否有数据
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package org.jeecg.modules.database.service.impl;
|
||||
|
||||
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.metadata.IPage;
|
||||
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 org.jeecg.common.system.query.QueryGenerator;
|
||||
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.SearchResult;
|
||||
import org.jeecg.modules.database.mapper.ComponentSearchMapper;
|
||||
@@ -38,11 +40,11 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
||||
|
||||
@Override
|
||||
public List<SearchResult> search(Integer type, String content) {
|
||||
SearchResult searchResult = new SearchResult();
|
||||
Map requestMap = new HashMap();
|
||||
requestMap.put("dataType", type);
|
||||
requestMap.put("content", content);
|
||||
QueryWrapper<SearchResult> queryWrapper = QueryGenerator.initQueryWrapper(searchResult,requestMap);
|
||||
|
||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SearchResult::getDataType, type);
|
||||
queryWrapper.likeRight(SearchResult::getContent, content);
|
||||
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
|
||||
@@ -52,12 +54,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
||||
if (CollUtil.isNotEmpty(experiment.getSampleInfoList())) {
|
||||
experiment.getSampleInfoList().forEach(sampleInfo -> {
|
||||
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);
|
||||
|
||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_NUMBER.getCode());
|
||||
queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleModel().trim());
|
||||
if (0L == this.count(queryWrapper)){
|
||||
SearchResult modelNumberRecord = new SearchResult();
|
||||
modelNumberRecord.setDataType(ComponentSearchType.MODEL_NUMBER.getCode());
|
||||
@@ -71,12 +70,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_NAME.getCode());
|
||||
queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleName().trim());
|
||||
if (0L == this.count(queryWrapper)){
|
||||
SearchResult modelNameRecord = new SearchResult();
|
||||
modelNameRecord.setDataType(ComponentSearchType.MODEL_NAME.getCode());
|
||||
@@ -90,11 +86,9 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
||||
}
|
||||
|
||||
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);
|
||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_BATCH_NO.getCode());
|
||||
queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getModelBatch().trim());
|
||||
if (0L == this.count(queryWrapper)){
|
||||
SearchResult modelBatchNoRecord = new SearchResult();
|
||||
modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
|
||||
|
||||
Reference in New Issue
Block a user