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-13 23:52:24 +08:00
parent 941f1833eb
commit 000a0ca80a
2 changed files with 22 additions and 3 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/controller/ExperimentController.java
View File

@@ -39,11 +39,11 @@ import java.util.Arrays;
@Slf4j
public class ExperimentController extends JeecgController<Experiment, IExperimentService> {
@Autowired
private IExperimentService experimentService;
private IExperimentService experimentService;
@Autowired
private IExperimentLogService experimentLogService;
@Autowired
private ISysUserService userService;
private ISysUserService userService;
/**
* 分页列表查询
@@ -57,7 +57,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
//@AutoLog(value = "试验管理-分页列表查询")
@Operation(summary = "试验管理-分页列表查询")
@GetMapping(value = "/list")
// @PermissionData(pageComponent="experiment/manage/ExperimentList")
// @PermissionData(pageComponent="experiment/manage/ExperimentList")
public Result<IPage<Experiment>> queryPageList(Experiment experiment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -128,6 +128,24 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
return Result.OK("删除成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "试验管理-试验复制")
@Operation(summary = "试验管理-试验复制")
//@RequiresPermissions("database:experiment:delete")
@PostMapping(value = "/copy")
public Result<String> copy(@RequestParam(name = "id", required = true) String id) {
Experiment experiment = experimentService.getById(id);
experiment.setStatus(ExperimentStatus.PRE_TEST);
experiment.setId(null);
experimentService.save(experiment);
return Result.OK("复制成功!");
}
/**
* 批量删除
*

1
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View File

@@ -76,6 +76,7 @@ public class CommonController {
if (StringUtils.isBlank(file)) {
return;
}
//http://127.0.0.1:8080/physical/sys/common/download?file=NASA/abfb6651bfee1e5daa9ccb254a02a174/PPM-99-045.pdf
String fileName = URLDecoder.decode(file, "UTF-8");
String objectUrl = MinioUtil.getObjectUrl(MinioUtil.getBucketName(), fileName, 2 * 24 * 60 * 60);
if (StringUtils.isBlank(objectUrl)) {