diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentType.java new file mode 100644 index 0000000..b3857b3 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentType.java @@ -0,0 +1,24 @@ +/* + * Ant Group + * Copyright (c) 2004-2024 All Rights Reserved. + */ +package org.jeecg.modules.database.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author lise + * @version Experiment.java, v 0.1 2024年11月08日 17:15 lise + */ +@Getter +@AllArgsConstructor +public enum ExperimentType { + fzsyjhb("辐照试验计划表"), + sbsyjlb("设备使用记录表"), + sybgpsb("试验报告评审表"), + sybg("试验报告"), + fzsyzjd("辐照试验总结单"); + + String type; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java index 3158f4c..727abdb 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java @@ -1,34 +1,28 @@ package org.jeecg.modules.database.controller; -import cn.hutool.core.io.FileUtil; -import cn.hutool.http.HttpUtil; +import cn.hutool.core.util.IdUtil; 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; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.ExampleObject; 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.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.database.constant.ExperimentType; import org.jeecg.modules.database.entity.ExperimentDoc; -import org.jeecg.modules.database.entity.ExperimentReport; import org.jeecg.modules.database.service.IExperimentDocService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.FileCopyUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.io.*; -import java.net.URLDecoder; import java.util.*; /** @@ -153,14 +147,25 @@ public class ExperimentDocController extends JeecgController> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ExperimentDoc::getExperimentId, experimentalId); - List experimentReview = experimentDocService.list(queryWrapper); - if (experimentReview == null) { - return Result.error("未找到对应数据"); + public Result> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentId) { + List result = new ArrayList<>(); + for (ExperimentType value : ExperimentType.values()) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentDoc::getExperimentId, experimentId); + queryWrapper.eq(ExperimentDoc::getDocType, value.getType()); + ExperimentDoc doc = experimentDocService.getOne(queryWrapper); + if (Objects.isNull(doc)) { + doc = experimentDocService.generate(experimentId, value.getType()); + } + if (Objects.isNull(doc)) { + doc = new ExperimentDoc(); + doc.setId(IdUtil.simpleUUID()); + doc.setExperimentId(experimentId); + doc.setDocType(value.getType()); + } + result.add(doc); } - return Result.OK(experimentReview); + return Result.OK(result); } /** @@ -170,11 +175,9 @@ public class ExperimentDocController extends JeecgController download(@RequestParam(name = "experimentId", required = true) String experimentId, @RequestParam(name = "type", required = true) String type, HttpServletResponse response) { @@ -198,10 +201,8 @@ public class ExperimentDocController extends JeecgController generate(@RequestParam(name = "experimentId", required = true) String experimentId, @RequestParam(name = "type", required = true) String type) {