physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-08 17:22:50 +08:00
parent 9a79354054
commit 7d4cb4bab9
2 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentType.java Normal file
View File

@@ -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;
}

47
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java
View File

@@ -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<ExperimentDoc, IExp
//@AutoLog(value = "试验评定-通过id查询")
@Operation(summary = "试验报告-通过实验ID查询")
@GetMapping(value = "/queryByExperimentId")
public Result<List<ExperimentDoc>> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
public Result<List<ExperimentDoc>> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentId) {
List<ExperimentDoc> result = new ArrayList<>();
for (ExperimentType value : ExperimentType.values()) {
LambdaQueryWrapper<ExperimentDoc> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ExperimentDoc::getExperimentId, experimentalId);
List<ExperimentDoc> experimentReview = experimentDocService.list(queryWrapper);
if (experimentReview == null) {
return Result.error("未找到对应数据");
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());
}
return Result.OK(experimentReview);
if (Objects.isNull(doc)) {
doc = new ExperimentDoc();
doc.setId(IdUtil.simpleUUID());
doc.setExperimentId(experimentId);
doc.setDocType(value.getType());
}
result.add(doc);
}
return Result.OK(result);
}
/**
@@ -170,11 +175,9 @@ public class ExperimentDocController extends JeecgController<ExperimentDoc, IExp
* @return
*/
//@AutoLog(value = "试验评定-通过id查询")
@Operation(summary = "试验文档下载", parameters = {
@Parameter(name = "experimentId", description = "实验id", required = true),
@Parameter(name = "type", description = "文档类型(辐照试验计划表,试验报告评审表,设备使用记录表,试验报告,辐照试验总结单)",
required = true),
})
@Operation(summary = "试验文档下载", parameters = {@Parameter(name = "experimentId", description = "实验id", required = true),
@Parameter(name = "type", description = "文档类型(辐照试验计划表,设备使用记录表,试验报告评审表,试验报告,辐照试验总结单)",
required = true),})
@GetMapping(value = "/download")
public Result<ExperimentDoc> 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<ExperimentDoc, IExp
* @param type
* @return
*/
@Operation(summary = "重新生成试验文档", parameters = {
@Parameter(name = "experimentId", description = "实验id", required = true),
@Parameter(name = "type", description = "文档类型", required = true),
})
@Operation(summary = "重新生成试验文档", parameters = {@Parameter(name = "experimentId", description = "实验id", required = true),
@Parameter(name = "type", description = "文档类型", required = true),})
@GetMapping(value = "/generate")
public Result<ExperimentDoc> generate(@RequestParam(name = "experimentId", required = true) String experimentId,
@RequestParam(name = "type", required = true) String type) {