fix:下载文件只检查项目、知识库文件权限&编辑指标
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
package com.sdm.project.controller;
|
||||
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.entity.ExportExcelFormat;
|
||||
import com.sdm.common.entity.req.task.TaskExportExcelFormat;
|
||||
import com.sdm.common.log.annotation.SysLog;
|
||||
import com.sdm.project.model.bo.ModifyTaskNode;
|
||||
import com.sdm.project.model.req.*;
|
||||
import com.sdm.project.model.resp.TaskCountResp;
|
||||
@@ -12,7 +12,6 @@ import com.sdm.project.service.ITaskService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.apache.catalina.User;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -37,6 +36,7 @@ public class SimulationTaskController {
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@SysLog("修改任务")
|
||||
@PostMapping("/edit")
|
||||
@Operation(summary = "修改任务", description = "修改任务")
|
||||
public SdmResponse edit(@RequestBody ModifyTaskNode req) {
|
||||
@@ -46,12 +46,14 @@ public class SimulationTaskController {
|
||||
/**
|
||||
* 驳回、启动、暂停、工时、关闭、关注、取消关注、编辑
|
||||
*/
|
||||
@SysLog("操作任务")
|
||||
@PostMapping("/operation")
|
||||
@Operation(summary = "操作任务", description = "操作任务")
|
||||
public SdmResponse operation(@RequestBody SpdmTaskOpr taskOpr) {
|
||||
return taskService.operation(taskOpr);
|
||||
}
|
||||
|
||||
@SysLog("关注或取消关注任务")
|
||||
@PostMapping("/attention")
|
||||
@Operation(summary = "关注或取消关注任务", description = "关注或取消关注任务")
|
||||
public SdmResponse attention(@RequestBody SpdmTaskAttentionReq req) {
|
||||
@@ -82,6 +84,7 @@ public class SimulationTaskController {
|
||||
return taskService.countByStatus(req);
|
||||
}
|
||||
|
||||
@SysLog("批量删除任务")
|
||||
@PostMapping("/batchDelete")
|
||||
@Operation(summary = "批量删除任务", description = "批量删除任务")
|
||||
public SdmResponse batchDeleteTask(@RequestBody SpdmTaskOpr taskOpr) {
|
||||
|
||||
@@ -163,7 +163,7 @@ public class YAModelController {
|
||||
{
|
||||
KeyResultReq addTaskRunReq = new KeyResultReq();
|
||||
addTaskRunReq.setFile(req.getFile());
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getScenario(), NodeTypeEnum.TASK.getValue(), 0);
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getScenario(), NodeTypeEnum.TASK.getValue(), 0L);
|
||||
if (fileMetadataInfoResp.getData() != null) {
|
||||
addTaskRunReq.setDirId(fileMetadataInfoResp.getData().getId());
|
||||
}
|
||||
|
||||
@@ -533,7 +533,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
||||
} else {
|
||||
SimulationRun simulationRun = new SimulationRun();
|
||||
// 设置算例的文件夹路径 挂在所属任务下面
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(simulationTask.getUuid(), NodeTypeEnum.TASK.getValue(), 0);
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(simulationTask.getUuid(), NodeTypeEnum.TASK.getValue(), 0L);
|
||||
if (fileMetadataInfoResp.getData() != null) {
|
||||
simulationRun.setFolderId(fileMetadataInfoResp.getData().getId());
|
||||
}
|
||||
@@ -671,7 +671,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
||||
public SdmResponse createRunDir(CreateDirReq req) {
|
||||
CreateDirReq createDirReq = new CreateDirReq();
|
||||
// 获取算例文件夹id
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getUuId(), NodeTypeEnum.RUN.getValue(), 0);
|
||||
SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getUuId(), NodeTypeEnum.RUN.getValue(), 0L);
|
||||
if (fileMetadataInfoResp.getData() != null) {
|
||||
createDirReq.setParDirId(fileMetadataInfoResp.getData().getId());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user