From db88127da974ef9dad9258f872cfcb2e544a611d Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Tue, 28 Nov 2023 13:55:19 +0800 Subject: [PATCH] (fix)(semantic) Modify data type of s2_collect in schema-mysql.sql and fixed startup problem when database data is empty (#442) Co-authored-by: jolunoluo --- launchers/standalone/src/main/resources/db/schema-mysql.sql | 4 ++-- .../semantic/model/application/ModelRelaServiceImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index 92e942ed5..33edd5eee 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -474,7 +474,7 @@ CREATE TABLE `s2_collect` ( `type` varchar(20) NOT NULL, `username` varchar(20) NOT NULL, `collect_id` bigint NOT NULL, - `create_time` TIMESTAMP, - `update_time` TIMESTAMP, + `create_time` datetime, + `update_time` datetime, PRIMARY KEY (`id`) ); \ No newline at end of file diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java index fa3c3b8fa..4d42e9d3d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java @@ -3,6 +3,7 @@ package com.tencent.supersonic.semantic.model.application; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.ModelRela; @@ -45,9 +46,10 @@ public class ModelRelaServiceImpl public List getModelRela(List modelIds) { QueryWrapper wrapper = new QueryWrapper<>(); if (CollectionUtils.isEmpty(modelIds)) { - wrapper.lambda().in(ModelRelaDO::getFromModelId, modelIds).or() - .in(ModelRelaDO::getToModelId, modelIds); + return Lists.newArrayList(); } + wrapper.lambda().in(ModelRelaDO::getFromModelId, modelIds).or() + .in(ModelRelaDO::getToModelId, modelIds); return list(wrapper).stream().map(this::convert).collect(Collectors.toList()); }