From b68074bee5aa0a03b386a5cfb8ff8af78f5fc7b2 Mon Sep 17 00:00:00 2001 From: dengchun Date: Sat, 3 May 2025 15:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=95=B0=E6=8D=AE=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E6=B5=8B=E8=AF=95=E6=B5=81=E7=A8=8B=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/ComponentSearchType.java | 9 +++++--- .../service/IComponentSearchService.java | 8 +++++++ .../impl/ComponentSearchServiceImpl.java | 20 +++++++++++++++++ .../ExperimentTestProcessServiceImpl.java | 22 +++++++++++++++++++ 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ComponentSearchType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ComponentSearchType.java index 2d3fe1a..42b484b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ComponentSearchType.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ComponentSearchType.java @@ -10,9 +10,12 @@ public enum ComponentSearchType { MODEL_NUMBER(1, "样品型号"), MODEL_NAME(2, "样品名称"), MODEL_TYPE(3, "样品类型"), - MODEL_BATCH_NO(4, "样品批次"); + MODEL_BATCH_NO(4, "样品批次"), + TEST_PARAMS(5, "测试参数") + + ; - int code; - String name; + final int code; + final String name; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IComponentSearchService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IComponentSearchService.java index 0ff0e97..8ddfb5c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IComponentSearchService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IComponentSearchService.java @@ -14,4 +14,12 @@ public interface IComponentSearchService extends IService { void saveDataAfterSaveExperiment(Experiment experiment); boolean saveComponentSearch(SearchResult searchResult); + + /** + * 根据类型保存搜索记录 + * @param type 数据类型 + * @param content 数据内容 + * @return 保存结果 是否保存成功 + */ + boolean saveComponentSearchByType(int type, String content); } 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 e632864..3f9b122 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 @@ -112,4 +112,24 @@ public class ComponentSearchServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SearchResult::getDataType, type); + queryWrapper.likeRight(SearchResult::getContent, content); + if (0L == this.count(queryWrapper)){ + SearchResult modelBatchNoRecord = new SearchResult(); + modelBatchNoRecord.setDataType(type); + modelBatchNoRecord.setContent(content); + try { + result = saveOrUpdate(modelBatchNoRecord); + }catch (Exception e) { + logger.warn("搜索数据更新失败，type: " + type + ", 内容：" + content); + result = false; + } + } + return result; + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java index efe3075..d20e770 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java @@ -2,9 +2,13 @@ package org.jeecg.modules.database.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.database.constant.ComponentSearchType; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper; import org.jeecg.modules.database.service.*; @@ -29,6 +33,10 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl getByExperimentId(String experimentId) { List list = list( @@ -75,6 +83,19 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl nameList = jsonObject.stream().map(v -> ((JSONObject) v).getString("name")).collect(Collectors.toList()); + nameList.forEach(name -> { + componentSearchService.saveComponentSearchByType(ComponentSearchType.TEST_PARAMS.getCode(), name); + }); + } + + } } @Override @@ -94,4 +115,5 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl