From 3641c9c1762ae49ae03b7fc34c94bb71921ccd39 Mon Sep 17 00:00:00 2001 From: ls Date: Wed, 9 Jul 2025 22:19:16 +0800 Subject: [PATCH] Experiment edit --- ...xperimentDeviationConditionController.java | 30 +++++++++++++++---- ...xperimentDeviationEquipmentController.java | 26 ++++++++++++++-- .../ExperimentIrradiationBoardController.java | 28 ++++++++++++++--- 3 files changed, 72 insertions(+), 12 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java index d5f9ba4..a1bc8ce 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java @@ -8,6 +8,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -73,9 +75,17 @@ public class ExperimentDeviationConditionController @PostMapping(value = "/add") public Result add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空！"); - Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空！"); - - experimentDeviationConditionService.save(experimentDeviationCondition); + String sampleId = experimentDeviationCondition.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentDeviationCondition cloned = ObjectUtils.clone(experimentDeviationCondition); + cloned.setSampleId(id); + experimentDeviationConditionService.save(experimentDeviationCondition); + } + } else { + experimentDeviationConditionService.save(experimentDeviationCondition); + } return Result.OK(experimentDeviationCondition); } @@ -91,8 +101,18 @@ public class ExperimentDeviationConditionController @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) { Assert.hasText(experimentDeviationCondition.getExperimentId(), "实验ID不能为空！"); - Assert.hasText(experimentDeviationCondition.getSampleId(), "样品ID不能为空！"); - experimentDeviationConditionService.updateById(experimentDeviationCondition); + String sampleId = experimentDeviationCondition.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentDeviationCondition cloned = ObjectUtils.clone(experimentDeviationCondition); + cloned.setSampleId(id); + experimentDeviationConditionService.saveOrUpdate(experimentDeviationCondition); + } + } else { + experimentDeviationConditionService.updateById(experimentDeviationCondition); + } + return Result.OK(experimentDeviationCondition); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java index 6387630..94105cf 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; @@ -87,7 +88,17 @@ public class ExperimentDeviationEquipmentController experimentDeviationEquipment.setEquipmentId(equipment.getId()); experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate()); } - experimentDeviationEquipmentService.save(experimentDeviationEquipment); + String sampleId = experimentDeviationEquipment.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment); + cloned.setSampleId(id); + experimentDeviationEquipmentService.save(experimentDeviationEquipment); + } + } else { + experimentDeviationEquipmentService.save(experimentDeviationEquipment); + } return Result.OK(experimentDeviationEquipment); } @@ -103,14 +114,23 @@ public class ExperimentDeviationEquipmentController @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) { Assert.hasText(experimentDeviationEquipment.getExperimentId(), "实验ID不能为空！"); - Assert.hasText(experimentDeviationEquipment.getSampleId(), "样品ID不能为空！"); String equipmentNo = experimentDeviationEquipment.getManagementNo(); if (StringUtils.isNotBlank(equipmentNo) && StringUtils.isBlank(experimentDeviationEquipment.getMeasurementValidity())) { Equipment equipment = equipmentService.getByManagementNo(equipmentNo); experimentDeviationEquipment.setEquipmentId(equipment.getId()); experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate()); } - experimentDeviationEquipmentService.updateById(experimentDeviationEquipment); + String sampleId = experimentDeviationEquipment.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentDeviationEquipment cloned = ObjectUtils.clone(experimentDeviationEquipment); + cloned.setSampleId(id); + experimentDeviationEquipmentService.saveOrUpdate(experimentDeviationEquipment); + } + } else { + experimentDeviationEquipmentService.updateById(experimentDeviationEquipment); + } return Result.OK(experimentDeviationEquipment); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java index 9ebf08a..9b43f7a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java @@ -8,6 +8,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -72,8 +74,17 @@ public class ExperimentIrradiationBoardController extends JeecgController add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空！"); - Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空！"); - experimentIrradiationBoardService.save(experimentIrradiationBoard); + String sampleId = experimentIrradiationBoard.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentIrradiationBoard cloned = ObjectUtils.clone(experimentIrradiationBoard); + cloned.setSampleId(id); + experimentIrradiationBoardService.save(experimentIrradiationBoard); + } + } else { + experimentIrradiationBoardService.save(experimentIrradiationBoard); + } return Result.OK(experimentIrradiationBoard); } @@ -89,8 +100,17 @@ public class ExperimentIrradiationBoardController extends JeecgController edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) { Assert.hasText(experimentIrradiationBoard.getExperimentId(), "实验ID不能为空！"); - Assert.hasText(experimentIrradiationBoard.getSampleId(), "样品ID不能为空！"); - experimentIrradiationBoardService.updateById(experimentIrradiationBoard); + String sampleId = experimentIrradiationBoard.getSampleId(); + Assert.hasText(sampleId, "样品ID不能为空！"); + if (StringUtils.contains(sampleId, ",")) { + for (String id : sampleId.split(",")) { + ExperimentIrradiationBoard cloned = ObjectUtils.clone(experimentIrradiationBoard); + cloned.setSampleId(id); + experimentIrradiationBoardService.saveOrUpdate(experimentIrradiationBoard); + } + } else { + experimentIrradiationBoardService.updateById(experimentIrradiationBoard); + } return Result.OK(experimentIrradiationBoard); }