From 29795fbae6188cc38fa3a02e4d822b96c8876069 Mon Sep 17 00:00:00 2001 From: dengchun Date: Sun, 6 Jul 2025 09:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=BF=9D=E5=AD=983=E4=B8=AA=E8=AF=95?= =?UTF-8?q?=E9=AA=8C=E5=AE=9E=E6=96=BD=E8=BF=87=E7=A8=8B=E6=97=B6=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9A=82=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + .../ExperimentAnnealProcessController.java | 1 - .../database/service/IStageDataService.java | 2 +- .../ExperimentAnnealProcessServiceImpl.java | 38 +++---------------- ...ExperimentRadiationProcessServiceImpl.java | 7 ++++ .../ExperimentTestProcessServiceImpl.java | 7 ++++ .../service/impl/StageDataServiceImpl.java | 6 ++- 7 files changed, 27 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 5994c70..1c2c44c 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ pnpm run build # 后端发布 ## 测试环境 +cd /root/physical +sh build.sh docker compose pull docker compose up -d diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java index 8f3ffca..bca0d9f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java @@ -154,7 +154,6 @@ public class ExperimentAnnealProcessController extends JeecgController { boolean saveOrUpdateByBizId(StageData stageData); StageData queryStageDataByBizId(String bizId, int dataType); - void deleteByBizId(String bizId); + void deleteByBizId(String bizId, int dataType); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java index 0b7a607..787f75d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; 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.StageDataType; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper; import org.jeecg.modules.database.service.*; @@ -32,6 +33,8 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl getByExperimentId(String experimentId) { @@ -91,39 +94,10 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl deviationConditionList = JSON.parseArray(deviationCondition, - ExperimentDeviationCondition.class); - for (ExperimentDeviationCondition sampleInfo : deviationConditionList) { - if (StringUtils.equals(type, "add")) { - sampleInfo.setId(null); - } - sampleInfo.setExperimentId(experimentAnnealProcess.getExperimentId()); - experimentDeviationConditionService.saveOrUpdate(sampleInfo); - } - experimentAnnealProcess.setDeviationCondition(JSON.toJSONString(deviationConditionList)); - }*/ - - //加偏设备信息 - //20250502 - 邓春:不修改前端 传过来的退火设备大字段 -/* String deviationEquipment = experimentAnnealProcess.getDeviationEquipment(); - if (StringUtils.isNotBlank(deviationEquipment)) { - List deviationEquipmentList = JSON.parseArray(deviationEquipment, - ExperimentDeviationEquipment.class); - for (ExperimentDeviationEquipment sampleInfo : deviationEquipmentList) { - if (StringUtils.equals(type, "add")) { - sampleInfo.setId(null); - } - sampleInfo.setExperimentId(experimentAnnealProcess.getExperimentId()); - experimentDeviationEquipmentService.saveOrUpdate(sampleInfo); - } - experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList)); - }*/ saveOrUpdate(experimentAnnealProcess); + + // 删除暂存数据 20250706 邓春 + stageDataService.deleteByBizId(experimentAnnealProcess.getExperimentId(), StageDataType.ANNEAL_PROCESS.getCode()); } @Override diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java index 380ba28..32e1f96 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.date.TimeRange; +import org.jeecg.modules.database.constant.StageDataType; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper; import org.jeecg.modules.database.service.*; @@ -35,6 +36,9 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl getByExperimentId(String experimentId) { List list = list( @@ -106,6 +110,9 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl().eq(StageData::getBizId, bizId)); + public void deleteByBizId(String bizId, int dataType) { + baseMapper.delete(new LambdaQueryWrapper().eq(StageData::getBizId, bizId).eq(StageData::getDataType, dataType)); } }