feat:查询需求待办附件/算例结果归档/编辑报告上传报告结果/任务文件查询修改
This commit is contained in:
@@ -34,16 +34,16 @@ public enum FileBizTypeEnum {
|
||||
CLOUD_FILE(5),
|
||||
|
||||
/**
|
||||
* 网格文件
|
||||
* 流程脚本
|
||||
*/
|
||||
@Schema(description = "网格文件", example = "6")
|
||||
GRID_FILE(6),
|
||||
@Schema(description = "流程脚本", example = "6")
|
||||
FLOW_SCRIPT_FILE(6),
|
||||
|
||||
/**
|
||||
* 计算过程文件
|
||||
* 需求附件
|
||||
*/
|
||||
@Schema(description = "计算过程文件", example = "7")
|
||||
COMPUTE_PROCESS_FILE(7),
|
||||
@Schema(description = "需求附件", example = "7")
|
||||
DEMAND_FILE(7),
|
||||
|
||||
/**
|
||||
* 交付物文件
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.sdm.common.entity.req.data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CopyFileToTaskReq {
|
||||
|
||||
@Schema(description = "源文件id")
|
||||
private Long sourceFileId;
|
||||
|
||||
@Schema(description = "要复制到的文件夹关联uuid")
|
||||
private String parentUuid;
|
||||
}
|
||||
@@ -59,4 +59,8 @@ public class GetSimulationTaskFileReq extends BaseReq {
|
||||
|
||||
@Schema(description = "标签10")
|
||||
private String tag10;
|
||||
|
||||
@Schema(description = "查询层级:task 只查task下面的文件,不查子目录下的")
|
||||
private String level;
|
||||
|
||||
}
|
||||
|
||||
@@ -182,6 +182,10 @@ public class FileMetadataInfoResp extends BaseResp implements Serializable {
|
||||
|
||||
@Schema(description= "完成时间")
|
||||
private LocalDateTime finishTime;
|
||||
|
||||
@Schema(description = "文件来源 DM/EP")
|
||||
private String fileResource;
|
||||
|
||||
// 算列信息属性放在上面
|
||||
|
||||
public void setSimulationRunResp(SimulationRunResp simulationRunResp) {
|
||||
|
||||
@@ -258,4 +258,16 @@ public class DataClientFeignClientImpl implements IDataFeignClient {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse copyFileToTask(CopyFileToTaskReq req) {
|
||||
SdmResponse response;
|
||||
try {
|
||||
response = dataClient.copyFileToTask(req);
|
||||
return response;
|
||||
} catch (Exception e) {
|
||||
log.error("复制文件失败:", e);
|
||||
return SdmResponse.failed("复制文件失败");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.sdm.common.entity.req.system.QueryGroupDetailReq;
|
||||
import com.sdm.common.entity.req.system.UserListReq;
|
||||
import com.sdm.common.entity.req.system.UserQueryReq;
|
||||
import com.sdm.common.entity.resp.PageDataResp;
|
||||
import com.sdm.common.entity.resp.system.CIDStaffResp;
|
||||
import com.sdm.common.entity.resp.system.CIDUserResp;
|
||||
import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
|
||||
import com.sdm.common.feign.inter.system.ISysUserFeignClient;
|
||||
@@ -98,4 +99,19 @@ public class SysUserFeignClientImpl implements ISysUserFeignClient {
|
||||
return SdmResponse.failed("根据角色编码查询用户失败");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<List<CIDStaffResp>> listUserDetailByIds(UserQueryReq req) {
|
||||
SdmResponse<List<CIDStaffResp>> sdmResponse;
|
||||
try {
|
||||
sdmResponse = sysUserClient.listUserDetailByIds(req);
|
||||
if (!sdmResponse.isSuccess() || sdmResponse.getData() == null){
|
||||
return SdmResponse.failed("查询用户详细信息失败");
|
||||
}
|
||||
return sdmResponse;
|
||||
} catch (Exception e) {
|
||||
log.error("查询用户详细信息失败", e);
|
||||
return SdmResponse.failed("查询用户详细信息失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,4 +97,7 @@ public interface IDataFeignClient {
|
||||
@GetMapping("/data/getMultipartFileByFileId")
|
||||
SdmResponse<byte[]> getMultipartFileByFileId(@RequestParam(value = "fileId") @Validated Long fileId);
|
||||
|
||||
@PostMapping("/data/copyFileToTask")
|
||||
SdmResponse copyFileToTask(@RequestBody CopyFileToTaskReq req);
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.sdm.common.entity.req.system.LaunchApproveReq;
|
||||
import com.sdm.common.entity.req.system.QueryGroupDetailReq;
|
||||
import com.sdm.common.entity.req.system.UserListReq;
|
||||
import com.sdm.common.entity.req.system.UserQueryReq;
|
||||
import com.sdm.common.entity.resp.system.CIDStaffResp;
|
||||
import com.sdm.common.entity.resp.system.CIDUserResp;
|
||||
import com.sdm.common.entity.resp.PageDataResp;
|
||||
import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
|
||||
@@ -36,4 +37,7 @@ public interface ISysUserFeignClient {
|
||||
|
||||
@GetMapping("/user/getUserByRoleCode")
|
||||
SdmResponse<List<Long>> getUserByRoleCode(@RequestParam("roleCode") String roleCode, @RequestParam("tenantId") Long tenantId);
|
||||
|
||||
@PostMapping("/user/listUserDetailByIds")
|
||||
SdmResponse<List<CIDStaffResp>> listUserDetailByIds(@RequestBody UserQueryReq req);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user