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

Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2025-12-04 10:21:17 +08:00
parent 802015a472 95a8fa113c
commit 112417adb9
18 changed files with 330 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
View File

@@ -71,6 +71,9 @@ public class KeyResultReq extends BaseReq {
@Schema(description = "文件")
private MultipartFile file;
@Schema(description = "是否仅曲线上传文件")
private boolean onlyFile;
/**
* -------------------------------------------------上传交付物使用参数------------------------------------------------
*/

2
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -158,7 +158,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
SdmResponse response = dataClientFeignClient.createDir(createDirReq);
log.info("创建需求时，调用创建文件夹的返回值为：{}", response);
return SdmResponse.success(demandId);
return SdmResponse.success(req.getUuid());
}
@Transactional

2
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -746,7 +746,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
@Override
@Transactional(rollbackFor = Exception.class)
public SdmResponse addSimulationKeyResult(KeyResultReq req) {
if (KeyResultTypeEnum.CURVE.getKeyResultType().equals(req.getKeyResultType())) {
if (KeyResultTypeEnum.CURVE.getKeyResultType().equals(req.getKeyResultType()) && req.isOnlyFile()) {
CurveParamDto curveParamDto = getCurveParamsFromUpload(req.getFile(), 2);
return SdmResponse.success(curveParamDto);
}

3
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -53,7 +53,8 @@
#{it.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler}),#{it.imageFileId}
#{it.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
#{it.imageFileId})
</foreach>
</insert>