From 10fc6710ffa9c62ac70878110f707c506dde330e Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Fri, 12 Dec 2025 16:23:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A1=B9=E5=BA=93=E6=95=85=E9=9A=9C=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/YAModelController.java | 10 +++ .../sdm/task/dao/SimulationPoolMapper.java | 2 +- .../impl/SimulationTaskPoolServiceImpl.java | 73 +++++++++++++++++-- 3 files changed, 77 insertions(+), 8 deletions(-) diff --git a/project/src/main/java/com/sdm/project/controller/YAModelController.java b/project/src/main/java/com/sdm/project/controller/YAModelController.java index 392e931d..170d9967 100644 --- a/project/src/main/java/com/sdm/project/controller/YAModelController.java +++ b/project/src/main/java/com/sdm/project/controller/YAModelController.java @@ -97,6 +97,11 @@ public class YAModelController { int fileId = (int)data.get("fileId"); rsp.getWorkRequest().add(String.valueOf(fileId)); } + else + { + rsp.setCode("-200"); + rsp.setMessage(uploadRespond.getMessage()); + } return rsp; } @@ -138,6 +143,11 @@ public class YAModelController { int fileId = (int)data.get("fileId"); rsp.getWorkRequest().add(String.valueOf(fileId)); } + else + { + rsp.setCode("-200"); + rsp.setMessage(uploadRespond.getMessage()); + } return rsp; } diff --git a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java index de29d220..1388ac87 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -245,7 +245,7 @@ public interface SimulationPoolMapper { @Select("SELECT * FROM simulation_taskpool_flowtemplate_relate WHERE poolName=#{poolName}") List queryTaskFlowRelateByTaskPool(@Param("poolName") String poolName); - @Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,flowCode,taskUuid,`version`) SELECT poolName,flowCode,taskUuid,${newVersion} WHERE poolName=#{poolName} AND `version`=#{oldVersion}") + @Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,flowCode,taskUuid,`version`) SELECT poolName,flowCode,taskUuid,${newVersion} FROM simulation_taskpool_flowtemplate_relate WHERE poolName=#{poolName} AND `version`=#{oldVersion}") int copyTaskRelateToNewVersion(@Param("poolName")String poolName,@Param("oldVersion")String oldVersion,@Param("newVersion")String newVersion); @Select("SELECT * FROM simulation_taskpool_flowtemplate_relate WHERE poolName=#{poolName} AND version=#{version}") diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index a08cd666..794ccef1 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -124,6 +125,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul */ private void addTaskRelationCheckRepeat(String poolName,String version,List taskPoolItemList,int poolId) { + //为新增及更新的task重新绑定流程模版 for(TaskPoolItem taskPoolItem:taskPoolItemList) { String flowTemplate = taskPoolItem.flowTemplate; if (flowTemplate == null || flowTemplate.isEmpty()) { @@ -131,7 +133,6 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } String[] flowTemplates = flowTemplate.split(";"); for (String template : flowTemplates) { - SimulatePoolTaskFlowTemplateRelate relate = new SimulatePoolTaskFlowTemplateRelate(); if(mapper.queryTaskFlowRelate(template,poolName,version,taskPoolItem.uuid).isEmpty()) { SimulatePoolTaskFlowTemplateRelate templateRelate = new SimulatePoolTaskFlowTemplateRelate(); @@ -144,6 +145,34 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } } } + //为新增及更新task绑定知识库 + List saveFileSimulationMappingReq = new ArrayList<>(); + for(TaskPoolItem taskPoolItem:taskPoolItemList) { + String standard = taskPoolItem.standard; + if(standard == null || standard.isEmpty()) + { + continue; + } + String[] standardItems = standard.split(";"); + List fileIdList = new ArrayList<>(); + for(String item: standardItems) + { + String[] standardIds = item.split(","); + if(standardIds.length == 2) + { + String fileId = standardIds[1].trim(); + fileIdList.add(Long.valueOf(fileId)); + } + + } + SaveFileSimulationMappingReq req = new SaveFileSimulationMappingReq(); + req.setSimulationPoolTaskId(taskPoolItem.uuid); + req.setSimulationPoolVersion(version); + req.setSimulationPoolId(poolId); + req.setFileIds(fileIdList); + saveFileSimulationMappingReq.add(req); + } + simulationMappingFeignClient.batchSaveFileSimulationMapping(saveFileSimulationMappingReq); } /** @@ -151,7 +180,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param updateBean * @param currentBrief */ - private void handleUpdateTaskBindRelation(TaskPoolUpdateBean updateBean,TaskPoolBrief currentBrief) + private void handleUpdateTaskBindRelation(TaskPoolUpdateBean updateBean,TaskPoolBrief currentBrief,int oldPoolId) { String currentVersion = currentBrief.currentVersion; String poolName = currentBrief.poolName; @@ -163,7 +192,37 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul // 2.升版更新 if(updateBean.bNewVersion) { - mapper.copyTaskRelateToNewVersion(poolName,currentBrief.parentVersion,currentVersion); + //拷贝上个版本的流程模版绑定 + String constantVersion = "'"+currentVersion+"'"; + mapper.copyTaskRelateToNewVersion(poolName,currentBrief.parentVersion,constantVersion); + //拷贝上个版本的知识库绑定 + GetFileSimulationMappingReq mappingReq = new GetFileSimulationMappingReq(); + mappingReq.setSimulationPoolId(oldPoolId); + mappingReq.setSimulationPoolVersion(currentBrief.parentVersion); + SdmResponse>> fileMetaRsp = simulationMappingFeignClient.batchGetFileSimulationMappingBySimulationPoolIdAndVersion(mappingReq); + if(fileMetaRsp.isSuccess()) + { + Map> fileMetaMap = fileMetaRsp.getData(); + List saveFileSimulationMappingReq = new ArrayList<>(); + for(String taskUuid : fileMetaMap.keySet()) + { + List fileMetadataInfoRespList = fileMetaMap.get(taskUuid); + List fileIdList = new ArrayList<>(); + for(FileMetadataInfoResp fileMetadataInfoResp : fileMetadataInfoRespList) + { + fileIdList.add(fileMetadataInfoResp.getId()); + } + SaveFileSimulationMappingReq req = new SaveFileSimulationMappingReq(); + req.setSimulationPoolId(currentBrief.id); + req.setSimulationPoolVersion(currentBrief.currentVersion); + req.setSimulationPoolTaskId(taskUuid); + req.setFileIds(fileIdList); + saveFileSimulationMappingReq.add(req); + } + if(!saveFileSimulationMappingReq.isEmpty()) { + simulationMappingFeignClient.batchSaveFileSimulationMapping(saveFileSimulationMappingReq); + } + } } for(TaskPoolItem taskPoolItem:updateTasks) //删除更新分析项的关联关系 { @@ -1385,7 +1444,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul response = SdmResponse.failed("分析项库不存在"); return response; } - + int oldPoolId = oldPoolBrief.id; if(updateBean.bNewVersion) { //在当前分析项库活动版本记录中生成新版本 @@ -1406,8 +1465,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul mapper.deleteTaskPoolBrief(currPoolBrief.poolName); currPoolBrief.parentVersion = currPoolBrief.currentVersion; currPoolBrief.currentVersion = poolVersion.poolVersion; - poolVersion.poolId = mapper.addTaskPoolBreif(currPoolBrief); - currPoolBrief.id = poolVersion.poolId; + mapper.addTaskPoolBreif(currPoolBrief); + poolVersion.poolId = currPoolBrief.id; TaskPoolTree poolTree = (TaskPoolTree) treeRespond.getData(); poolVersion.versionContents = JSONObject.toJSONString(poolTree); mapper.addTaskPoolVersion(poolVersion); @@ -1448,7 +1507,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } if(response.isSuccess()) { - handleUpdateTaskBindRelation(updateBean,currPoolBrief); + handleUpdateTaskBindRelation(updateBean,currPoolBrief,oldPoolId); } return response; } From d67e56554e5b8d70fdeb04047662f5572d9d1ef3 Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Fri, 12 Dec 2025 16:30:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataStorageAnalysisController.java | 2 +- .../service/impl/DataStorageAnalysisImpl.java | 8 ++++---- flowable/repomix-output.xml | 15 +++++++++++++-- .../impl/SimulationExternalServiceImpl.java | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java index 763ec21c..12fca242 100644 --- a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java +++ b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java @@ -62,7 +62,7 @@ public class DataStorageAnalysisController { return SdmResponse.success(result); } catch (Exception e) { log.error("获取文件空间占用失败", e); - return SdmResponse.failed("获取文件空间占用失败"); + return SdmResponse.success(); } } diff --git a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java index c4a13894..e6c934a7 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java @@ -69,7 +69,8 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { SdmResponse> response = simuluationNodeFeignClient.getAllNodeByProjectIdAndType(uuid, queryNodeType); Long tenantId = ThreadLocalContext.getTenantId(); if (!response.isSuccess()) { - return SdmResponse.failed("获取节点信息失败"); + log.error("获取节点信息失败"); + return SdmResponse.success(); } List nodeLists = response.getData(); @@ -92,7 +93,8 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { .eq(FileMetadataInfo::getTenantId, tenantId) .list().stream().collect(Collectors.toMap(FileMetadataInfo::getRelatedResourceUuid, FileMetadataInfo::getId)); if (CollectionUtils.isEmpty(uuidToDirIdMap)) { - return SdmResponse.failed("获取节点信息失败"); + log.error("获取节点信息失败"); + return SdmResponse.success(); } // fileMetadIds: uuid对应的fileid结合 @@ -136,8 +138,6 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { }); } - - return SdmResponse.success(result); } diff --git a/flowable/repomix-output.xml b/flowable/repomix-output.xml index 0bfc2bd0..06fb372a 100644 --- a/flowable/repomix-output.xml +++ b/flowable/repomix-output.xml @@ -1011,6 +1011,7 @@ package com.sdm.flowable.delegate.handler; import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; +import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.entity.flowable.executeConfig.ExportWordScriptExecuteConfig; import com.sdm.common.entity.req.data.GetFileBaseInfoReq; import com.sdm.common.entity.req.data.UploadFilesReq; @@ -1070,8 +1071,14 @@ public class ExportWordScriptHandler implements ExecutionHandler Date: Fri, 12 Dec 2025 16:36:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataStorageAnalysisController.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java index 12fca242..24d0b06b 100644 --- a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java +++ b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java @@ -48,22 +48,23 @@ public class DataStorageAnalysisController { @Parameter(description = "查询时间间隔（月）") @RequestParam(value = "intervalMonths", required = false) Integer intervalMonths, @Parameter(description = "增量查询指定的月：2025-06") @RequestParam(value = "targetYm", required = false) String targetYm ) { - try { - if (ObjectUtils.isEmpty(queryNodeType) || ObjectUtils.isEmpty(uuids)) { - return SdmResponse.success(); - } - List> result = new ArrayList<>(); - for (String uuid : uuids) { + + if (ObjectUtils.isEmpty(queryNodeType) || ObjectUtils.isEmpty(uuids)) { + return SdmResponse.success(); + } + List> result = new ArrayList<>(); + for (String uuid : uuids) { + try { SdmResponse> sdmResponse = dataStorageAnalysis.getNodeSizeByNodeType(queryNodeType, uuid, intervalMonths, targetYm); if (sdmResponse.getData() != null) { result.add(sdmResponse.getData()); } + } catch (Exception e) { + log.error("获取文件空间占用失败", e); } - return SdmResponse.success(result); - } catch (Exception e) { - log.error("获取文件空间占用失败", e); - return SdmResponse.success(); } + return SdmResponse.success(result); + } /**