toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2026-03-13 14:18:00 +08:00
parent 0a7fe3b5d0 c4336f5574
commit 4e170972a1
17 changed files with 89 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java
View File

@@ -2,6 +2,7 @@ package com.sdm.common.entity.req.data;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.sdm.common.entity.enums.FileBizTypeEnum;
import com.sdm.common.entity.req.system.DictTagReq;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -79,6 +80,8 @@ public class UploadFilesReq {
@Schema(description= "算例下文件的排序字段，数值越小越靠前")
private Integer sortOrder;
@Schema(description = "标签请求参数字符串")
private String tagReqStr;
/**
* 标签请求参数 设置tag1-tag10 ,taskId, runId记录文件所属节点信息
*/
@@ -146,15 +149,19 @@ public class UploadFilesReq {
private Boolean isConverSameNameFile = false;
@Schema(description = "x轴物理量（曲线结果使用）")
@JsonProperty(value = "xQuantityType")
private String xQuantityType;
@Schema(description = "x轴结果单位（曲线结果使用）")
@JsonProperty(value = "xUnits")
private String xUnits;
@Schema(description = "y轴物理量（曲线结果使用）")
@JsonProperty(value = "yQuantityType")
private String yQuantityType;
@Schema(description = "y轴结果单位（曲线结果使用）")
@JsonProperty(value = "yUnits")
private String yUnits;
/**

12
common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java
View File

@@ -143,6 +143,12 @@ public class SpdmTaskVo extends BaseEntity {
@JsonProperty(value = "eMemberList")
private List<CIDUserResp> eMemberList;
/**
* 关注人
*/
@JsonProperty(value = "payAttentionMemberList")
private List<CIDUserResp> payAttentionMemberList;
/**
* 0：未关注 1：已关注
*/
@@ -214,12 +220,6 @@ public class SpdmTaskVo extends BaseEntity {
private String tag9Code;
private String tag10Code;
/**
* 仿真关注人
*/
@JsonProperty(value = "payAttentionMemberList")
private List<CIDUserResp> payAttentionMemberList;
/**
* 仿真执行人userId
*/

13
common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
View File

@@ -167,19 +167,6 @@ public class DataClientFeignClientImpl implements IDataFeignClient {
}
}
@Override
public SdmResponse uploadFilesWithTag(UploadFilesReq uploadFilesReq, MultipartFile file) {
SdmResponse response;
try {
response = dataClient.uploadFilesWithTag(uploadFilesReq, file);
log.info("上传文件响应：" + response);
return response;
} catch (Exception e) {
log.error("上传文件失败", e);
return SdmResponse.failed("上传文件失败");
}
}
@Override
public SdmResponse<FileMetadataInfoResp> queryFileMetadataInfo(String uuid, String uuidOwnType, Long dirId) {
SdmResponse<FileMetadataInfoResp> response;

4
common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
View File

@@ -62,10 +62,6 @@ public interface IDataFeignClient {
@PostMapping(value = "/data/uploadFiles",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
SdmResponse uploadFiles(UploadFilesReq req);
@PostMapping(value = "/data/uploadFilesWithTag", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
SdmResponse uploadFilesWithTag(@RequestPart("uploadFilesReq") UploadFilesReq uploadFilesReq,
@RequestPart("file") MultipartFile file);
@GetMapping("/data/queryFileMetadataInfo")
SdmResponse<FileMetadataInfoResp> queryFileMetadataInfo(@RequestParam(value = "uuid") String uuid, @RequestParam(value = "uuidOwnType") String uuidOwnType, @RequestParam(value = "dirId") Long dirId);