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

Merge remote-tracking branch 'origin/dev-v2' into dev-v2

Browse Source
This commit is contained in:
wisonic-s 2024-07-03 16:40:06 +08:00
commit b09fb0acd8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
View File

@ -116,6 +116,7 @@ public class DataSourceManage {
updateWrapper.eq("id", coreDatasource.getId()); updateWrapper.eq("id", coreDatasource.getId());
coreDatasource.setUpdateTime(System.currentTimeMillis()); coreDatasource.setUpdateTime(System.currentTimeMillis());
coreDatasource.setUpdateBy(AuthUtils.getUser().getUserId()); coreDatasource.setUpdateBy(AuthUtils.getUser().getUserId());
coreDatasource.setTaskStatus(TaskStatus.WaitingForExecution.name());
coreDatasourceMapper.update(coreDatasource, updateWrapper); coreDatasourceMapper.update(coreDatasource, updateWrapper);
coreOptRecentManage.saveOpt(coreDatasource.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE); coreOptRecentManage.saveOpt(coreDatasource.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE);
} }
@ -125,7 +126,8 @@ public class DataSourceManage {
public void innerEditStatus(CoreDatasource coreDatasource) { public void innerEditStatus(CoreDatasource coreDatasource) {
UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", coreDatasource.getId()); updateWrapper.eq("id", coreDatasource.getId());
coreDatasourceMapper.update(coreDatasource, updateWrapper); updateWrapper.set("status", coreDatasource.getStatus());
coreDatasourceMapper.update(null, updateWrapper);
} }
@ -136,12 +138,16 @@ public class DataSourceManage {
if (ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(sourceData = coreDatasourceMapper.selectById(id))) { if (ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(sourceData = coreDatasourceMapper.selectById(id))) {
DEException.throwException("resource not exist"); DEException.throwException("resource not exist");
} }
sourceData.setUpdateTime(System.currentTimeMillis());
sourceData.setUpdateBy(AuthUtils.getUser().getUserId());
sourceData.setPid(dataSourceDTO.getPid());
sourceData.setName(dataSourceDTO.getName());
checkName(dataSourceDTO); checkName(dataSourceDTO);
coreDatasourceMapper.updateById(sourceData);
UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
updateWrapper.set("update_time", System.currentTimeMillis());
updateWrapper.set("pid", dataSourceDTO.getPid());
updateWrapper.set("name", dataSourceDTO.getName());
updateWrapper.set("update_by", AuthUtils.getUser().getUserId());
coreDatasourceMapper.update(null, updateWrapper);
coreOptRecentManage.saveOpt(sourceData.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE); coreOptRecentManage.saveOpt(sourceData.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE);
} }