center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix:【系统设置】支持引擎设置

Browse Source
This commit is contained in:
taojinlong 2024-03-05 12:16:02 +08:00
parent f9e2a0293c
commit 412b2776a7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@ -650,10 +650,14 @@ public class DatasourceServer implements DatasourceApi {
}
private DatasourceDTO validate(CoreDatasource coreDatasource) {
String lastStatus = coreDatasource.getStatus();
DatasourceDTO datasourceDTO = new DatasourceDTO();
BeanUtils.copyBean(datasourceDTO, coreDatasource);
try {
checkDatasourceStatus(coreDatasource);
if(StringUtils.isNotEmpty(lastStatus) && StringUtils.isNotEmpty(coreDatasource.getStatus()) && lastStatus.equalsIgnoreCase("Error") && coreDatasource.getStatus().equalsIgnoreCase("Success")){
calciteProvider.update(datasourceDTO);
}
} catch (Exception e) {
coreDatasource.setStatus("Error");
DEException.throwException(e.getMessage());

7
core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
View File

@ -5,6 +5,7 @@ import io.dataease.api.ds.EngineApi;
import io.dataease.datasource.dao.auto.entity.CoreDeEngine;
import io.dataease.datasource.dao.auto.mapper.CoreDeEngineMapper;
import io.dataease.datasource.manage.EngineManage;
import io.dataease.datasource.provider.CalciteProvider;
import io.dataease.utils.BeanUtils;
import io.dataease.utils.IDUtils;
import jakarta.annotation.Resource;
@ -24,7 +25,8 @@ public class EngineServer implements EngineApi {
private CoreDeEngineMapper deEngineMapper;
@Resource
private EngineManage engineManage;
@Resource
private CalciteProvider calciteProvider;
@Override
public DatasourceDTO getEngine() {
@ -41,15 +43,16 @@ public class EngineServer implements EngineApi {
if (StringUtils.isNotEmpty(datasourceDTO.getConfiguration())) {
datasourceDTO.setConfiguration(new String(Base64.getDecoder().decode(datasourceDTO.getConfiguration())));
}
CoreDeEngine coreDeEngine = new CoreDeEngine();
BeanUtils.copyBean(coreDeEngine, datasourceDTO);
if(coreDeEngine.getId() == null){
coreDeEngine.setId(IDUtils.snowID());
datasourceDTO.setId(coreDeEngine.getId());
deEngineMapper.insert(coreDeEngine);
}else {
deEngineMapper.updateById(coreDeEngine);
}
calciteProvider.update(datasourceDTO);
}
@Override