opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-09-22 04:27:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error modifying environment

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-09-03 17:41:14 +08:00
parent f5a13ba17f
commit bdd638efce
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/DataSourceCreateParam.java
View File

@ -7,6 +7,7 @@ import ai.chat2db.spi.model.KeyValue;
import ai.chat2db.spi.model.SSHInfo; import ai.chat2db.spi.model.SSHInfo;
import ai.chat2db.spi.model.SSLInfo; import ai.chat2db.spi.model.SSLInfo;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
/** /**
@ -101,4 +102,10 @@ public class DataSourceCreateParam {
* @see ai.chat2db.server.domain.api.enums.DataSourceKindEnum * @see ai.chat2db.server.domain.api.enums.DataSourceKindEnum
*/ */
private String kind; private String kind;
/**
* 环境id
*/
@NotNull
private Long environmentId;
} }

2
chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/service/DataSourceService.java
View File

@ -64,7 +64,7 @@ public interface DataSourceService {
* @return * @return
* @throws ai.chat2db.server.tools.common.exception.DataNotFoundException * @throws ai.chat2db.server.tools.common.exception.DataNotFoundException
*/ */
DataResult<DataSource> queryExistent(@NotNull Long id); DataResult<DataSource> queryExistent(@NotNull Long id, DataSourceSelector selector);
/** /**
* 克隆连接 * 克隆连接

12
chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java
View File

@ -45,6 +45,7 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@ -117,7 +118,7 @@ public class DataSourceServiceImpl implements DataSourceService {
@Override @Override
public DataResult<Long> updateWithPermission(DataSourceUpdateParam param) { public DataResult<Long> updateWithPermission(DataSourceUpdateParam param) {
DataSource dataSource = queryExistent(param.getId()).getData(); DataSource dataSource = queryExistent(param.getId(), null).getData();
PermissionUtils.checkOperationPermission(dataSource.getUserId()); PermissionUtils.checkOperationPermission(dataSource.getUserId());
DataSourceDO dataSourceDO = dataSourceConverter.param2do(param); DataSourceDO dataSourceDO = dataSourceConverter.param2do(param);
@ -129,7 +130,7 @@ public class DataSourceServiceImpl implements DataSourceService {
@Override @Override
public ActionResult deleteWithPermission(Long id) { public ActionResult deleteWithPermission(Long id) {
DataSource dataSource = queryExistent(id).getData(); DataSource dataSource = queryExistent(id, null).getData();
PermissionUtils.checkOperationPermission(dataSource.getUserId()); PermissionUtils.checkOperationPermission(dataSource.getUserId());
dataSourceMapper.deleteById(id); dataSourceMapper.deleteById(id);
@ -143,17 +144,20 @@ public class DataSourceServiceImpl implements DataSourceService {
} }
@Override @Override
public DataResult<DataSource> queryExistent(Long id) { public DataResult<DataSource> queryExistent(Long id, DataSourceSelector selector) {
DataResult<DataSource> dataResult = queryById(id); DataResult<DataSource> dataResult = queryById(id);
if (dataResult.getData() == null) { if (dataResult.getData() == null) {
throw new DataNotFoundException(); throw new DataNotFoundException();
} }
fillData(Lists.newArrayList(dataResult.getData()), selector);
return dataResult; return dataResult;
} }
@Override @Override
public DataResult<Long> copyByIdWithPermission(Long id) { public DataResult<Long> copyByIdWithPermission(Long id) {
DataSource dataSource = queryExistent(id).getData(); DataSource dataSource = queryExistent(id, null).getData();
PermissionUtils.checkOperationPermission(dataSource.getUserId()); PermissionUtils.checkOperationPermission(dataSource.getUserId());
DataSourceDO dataSourceDO = dataSourceMapper.selectById(id); DataSourceDO dataSourceDO = dataSourceMapper.selectById(id);

2
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
View File

@ -184,7 +184,7 @@ public class DataSourceController {
*/ */
@GetMapping("/datasource/{id}") @GetMapping("/datasource/{id}")
public DataResult<DataSourceVO> queryById(@PathVariable("id") Long id) { public DataResult<DataSourceVO> queryById(@PathVariable("id") Long id) {
DataResult<DataSource> dataResult = dataSourceService.queryById(id); DataResult<DataSource> dataResult = dataSourceService.queryExistent(id, DATA_SOURCE_SELECTOR);
DataSourceVO dataSourceVO = dataSourceWebConverter.dto2vo(dataResult.getData()); DataSourceVO dataSourceVO = dataSourceWebConverter.dto2vo(dataResult.getData());
if (StringUtils.isNotBlank(dataSourceVO.getUser())) { if (StringUtils.isNotBlank(dataSourceVO.getUser())) {
dataSourceVO.setAuthenticationType("1"); dataSourceVO.setAuthenticationType("1");

5
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
View File

@ -101,6 +101,11 @@ public class DataSourceVO {
*/ */
private DriverConfig driverConfig; private DriverConfig driverConfig;
/**
* 环境id
*/
private Long environmentId;
/** /**
* 环境 * 环境
*/ */