From d1ccdfa657de217c50c5b223958b92fc2c553f2f Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Tue, 3 Feb 2026 19:15:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-02-03/system/system_param_config.sql | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 1-sql/2026-02-03/system/system_param_config.sql diff --git a/1-sql/2026-02-03/system/system_param_config.sql b/1-sql/2026-02-03/system/system_param_config.sql new file mode 100644 index 00000000..cdfb068b --- /dev/null +++ b/1-sql/2026-02-03/system/system_param_config.sql @@ -0,0 +1,34 @@ +/* + Navicat Premium Dump SQL + + Source Server : 基线版本 + Source Server Type : MySQL + Source Server Version : 80043 (8.0.43) + Source Host : 192.168.65.161:3306 + Source Schema : spdm_baseline + + Target Server Type : MySQL + Target Server Version : 80043 (8.0.43) + File Encoding : 65001 + + Date: 03/02/2026 18:51:57 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for system_param_config +-- ---------------------------- +DROP TABLE IF EXISTS `system_param_config`; +CREATE TABLE `system_param_config` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `paramName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '系统参数名称', + `paramValue` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '系统参数值', + `tenantId` bigint NOT NULL DEFAULT 0 COMMENT '租户ID', + `creator` bigint NOT NULL DEFAULT 0 COMMENT '创建者', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 116 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; From a4fe852e41988961010430a7e178d217975e29a1 Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Tue, 3 Feb 2026 19:44:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=96=87=E4=BB=B6=E6=89=93=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MinioFileIDataFileServiceImpl.java | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index 0487884d..676a1e57 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -1934,12 +1934,19 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { return SdmResponse.success(); } + /** + * 收集目录ID列表（包含当前目录和所有祖先目录） + * @param dirId 当前目录ID + * @return 目录ID列表（当前目录 + 父目录 + ... + 根目录） + */ private List collectAncestorDirIds(Long dirId) { Long parentDirId = dirId; List ancestorDirIds = new ArrayList<>(); while (parentDirId != null) { ancestorDirIds.add(parentDirId); - parentDirId = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getId, parentDirId).oneOpt() + parentDirId = fileMetadataInfoService.lambdaQuery() + .eq(FileMetadataInfo::getId, parentDirId) + .oneOpt() .map(FileMetadataInfo::getParentId) .orElse(null); } @@ -1980,6 +1987,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { Long tenantId = ThreadLocalContext.getTenantId(); Long creatorId = ThreadLocalContext.getUserId(); long fileSize = resolveFileSize(req); + Long currentDirId = dirMetadataInfo.getId(); // 从缓存获取字典标签ID（已由AOP切面自动填充） Map> dictIdMap = req.getDictTagIdsCache(); @@ -1993,8 +2001,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } } - List directRelList = new ArrayList<>(); - List derivedRelList = new ArrayList<>(); + List allTagRelList = new ArrayList<>(); // 遍历查询结果，构造文件标签关系 for (Map.Entry> classEntry : dictIdMap.entrySet()) { @@ -2006,35 +2013,23 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { continue; } - // 创建当前目录的直接关联 - FileTagRel directRel = new FileTagRel(); - directRel.setFileId(fileInfo.getId()); - directRel.setTagId(dictId); - directRel.setDirId(dirMetadataInfo.getId()); - directRel.setTenantId(tenantId); - directRel.setCreatorId(creatorId); - directRel.setFileSize(fileSize); - directRelList.add(directRel); - - // 创建祖先目录的派生关联 + // 为所有目录（当前目录 + 祖先目录）创建标签关系 for (Long dirIdItem : ancestorDirIds) { - FileTagRel derivedRel = new FileTagRel(); - derivedRel.setFileId(fileInfo.getId()); - derivedRel.setTagId(dictId); - derivedRel.setDirId(dirIdItem); - derivedRel.setTenantId(tenantId); - derivedRel.setCreatorId(creatorId); - derivedRel.setFileSize(fileSize); - derivedRelList.add(derivedRel); + FileTagRel tagRel = new FileTagRel(); + tagRel.setFileId(fileInfo.getId()); + tagRel.setTagId(dictId); + tagRel.setDirId(dirIdItem); + tagRel.setTenantId(tenantId); + tagRel.setCreatorId(creatorId); + tagRel.setFileSize(fileSize); + allTagRelList.add(tagRel); } } } - if (CollectionUtils.isNotEmpty(directRelList)) { - fileTagRelService.saveBatch(directRelList); - } - if (CollectionUtils.isNotEmpty(derivedRelList)) { - fileTagRelService.saveBatch(derivedRelList); + // 一次性批量插入所有标签关系 + if (CollectionUtils.isNotEmpty(allTagRelList)) { + fileTagRelService.saveBatch(allTagRelList); } } From 5622c41c39bee2853b70e989a45c383acd3e59c9 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Tue, 3 Feb 2026 20:20:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93=E6=80=A7=E8=83=BD=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=B1=9E=E6=80=A7=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java b/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java index 0b484021..44fc1ef9 100644 --- a/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java +++ b/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java @@ -32,6 +32,8 @@ public class TaskPoolItem extends NodeBase{ public List performances = new ArrayList<>(); + public List children = new ArrayList<>(); + public void addTaskExtra(TaskPoolItemExtra extra) { extras.add(extra);