From 5ef9157438f82b5c82d43fffee1510a0575b77ab Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 17 Apr 2026 11:15:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=90=8C=E6=AD=A5pg=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1-sql/VastBaseG100/spdm_baseline_pg.sql | 34 ++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/1-sql/VastBaseG100/spdm_baseline_pg.sql b/1-sql/VastBaseG100/spdm_baseline_pg.sql index e846d23d..0e08d757 100644 --- a/1-sql/VastBaseG100/spdm_baseline_pg.sql +++ b/1-sql/VastBaseG100/spdm_baseline_pg.sql @@ -2109,6 +2109,9 @@ CREATE TABLE sys_dept_user ( id SERIAL PRIMARY KEY, deptId BIGINT NOT NULL, deptName VARCHAR(255), + simulationType VARCHAR(255), + discipline VARCHAR(255), + stage VARCHAR(255), userId BIGINT NOT NULL, tenantId BIGINT NOT NULL DEFAULT 0, creator BIGINT NOT NULL DEFAULT 0, @@ -2117,6 +2120,9 @@ CREATE TABLE sys_dept_user ( COMMENT ON TABLE sys_dept_user IS '部门负责人表'; COMMENT ON COLUMN sys_dept_user.deptId IS '部门ID'; COMMENT ON COLUMN sys_dept_user.deptName IS '部门名称'; +COMMENT ON COLUMN sys_dept_user.simulationType IS '仿真类型'; +COMMENT ON COLUMN sys_dept_user.discipline IS '学科'; +COMMENT ON COLUMN sys_dept_user.stage IS '阶段'; COMMENT ON COLUMN sys_dept_user.userId IS '部门负责人用户ID'; COMMENT ON COLUMN sys_dept_user.tenantId IS '租户ID'; COMMENT ON COLUMN sys_dept_user.creator IS '创建者ID'; @@ -2483,4 +2489,30 @@ COMMENT ON COLUMN training_model_algorithm_param.roundPrint IS '轮次打印间 COMMENT ON COLUMN training_model_algorithm_param.round IS '总轮次（如：1001）'; COMMENT ON COLUMN training_model_algorithm_param.preDisposeData IS '是否预处理数据（如：false）'; COMMENT ON COLUMN training_model_algorithm_param.disposeMethod IS '数据处理方法（如：minmax）'; -COMMENT ON COLUMN training_model_algorithm_param.dataNoOrder IS '数据是否无序（如：false）'; \ No newline at end of file +COMMENT ON COLUMN training_model_algorithm_param.dataNoOrder IS '数据是否无序（如：false）'; + +-- 用户关系表 +DROP TABLE IF EXISTS sys_user_relation; +CREATE TABLE sys_user_relation ( + id bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + user_id bigint NOT NULL, + related_user_id bigint NOT NULL, + relation_type smallint NOT NULL DEFAULT 1, + tenant_id bigint, + create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT pk_sys_user_relation PRIMARY KEY (id), + CONSTRAINT uk_user_relation UNIQUE (user_id, related_user_id, relation_type) +); + +-- 注释 +COMMENT ON COLUMN sys_user_relation.id IS '主键ID'; +COMMENT ON COLUMN sys_user_relation.user_id IS '主动方用户ID'; +COMMENT ON COLUMN sys_user_relation.related_user_id IS '被动方用户ID'; +COMMENT ON COLUMN sys_user_relation.relation_type IS '关系类型: 1-负责人与下属'; +COMMENT ON COLUMN sys_user_relation.tenant_id IS '租户ID'; +COMMENT ON COLUMN sys_user_relation.create_time IS '创建时间'; +COMMENT ON TABLE sys_user_relation IS '用户关系表'; + +-- 索引 +CREATE INDEX idx_user_id ON sys_user_relation (user_id); +CREATE INDEX idx_related_user_id ON sys_user_relation (related_user_id); \ No newline at end of file From a4cc566ec862722a8da350e2266f8a6366f85233 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 17 Apr 2026 11:39:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=BE=85=E5=8A=9E=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=9C=89nodeName=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BAnull=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/project/service/impl/TaskServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index ee65421d..94985a6b 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1871,7 +1871,7 @@ public class TaskServiceImpl implements ITaskService { } // 发送消息通知 newUserIdList.forEach(i -> { - sendMessage(MessageTemplateEnum.TASK_ISSUE, req.getNodeName(), String.valueOf(i), taskId); + sendMessage(MessageTemplateEnum.TASK_ISSUE, task.getTaskName(), String.valueOf(i), taskId); }); List filePermissions = new ArrayList<>(); @@ -5186,7 +5186,7 @@ public class TaskServiceImpl implements ITaskService { batchUpdatePermission(filePermissions); // 发送消息通知 newUserIdList.forEach(i -> { - sendMessage(MessageTemplateEnum.TASK_ISSUE, req.getNodeName(), String.valueOf(i), taskId); + sendMessage(MessageTemplateEnum.TASK_ISSUE, task.getTaskName(), String.valueOf(i), taskId); }); } return SdmResponse.success();