topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-13 13:07:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(fix)(semantic) Modify data type of s2_collect in schema-mysql.sql and fixed startup problem when database data is empty (#442)

Browse Source 
Co-authored-by: jolunoluo
This commit is contained in:
LXW
2023-11-28 13:55:19 +08:00
committed by GitHub
parent 0e492ef402
commit db88127da9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launchers/standalone/src/main/resources/db/schema-mysql.sql
View File

@@ -474,7 +474,7 @@ CREATE TABLE `s2_collect` (
`type` varchar(20) NOT NULL, `type` varchar(20) NOT NULL,
`username` varchar(20) NOT NULL, `username` varchar(20) NOT NULL,
`collect_id` bigint NOT NULL, `collect_id` bigint NOT NULL,
`create_time` TIMESTAMP, `create_time` datetime,
`update_time` TIMESTAMP, `update_time` datetime,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
); );

6
semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.tencent.supersonic.semantic.model.application;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.auth.api.authentication.pojo.User;
import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.JoinCondition;
import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.ModelRela;
@@ -45,9 +46,10 @@ public class ModelRelaServiceImpl
public List<ModelRela> getModelRela(List<Long> modelIds) { public List<ModelRela> getModelRela(List<Long> modelIds) {
QueryWrapper<ModelRelaDO> wrapper = new QueryWrapper<>(); QueryWrapper<ModelRelaDO> wrapper = new QueryWrapper<>();
if (CollectionUtils.isEmpty(modelIds)) { if (CollectionUtils.isEmpty(modelIds)) {
wrapper.lambda().in(ModelRelaDO::getFromModelId, modelIds).or() return Lists.newArrayList();
.in(ModelRelaDO::getToModelId, modelIds);
} }
wrapper.lambda().in(ModelRelaDO::getFromModelId, modelIds).or()
.in(ModelRelaDO::getToModelId, modelIds);
return list(wrapper).stream().map(this::convert).collect(Collectors.toList()); return list(wrapper).stream().map(this::convert).collect(Collectors.toList());
} }