Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
491a0d5d
提交
491a0d5d
authored
4月 06, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(backend):增加create_by字段
上级
93ce2bbe
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
16 行增加
和
1 行删除
+16
-1
ChartGroupService.java
...ain/java/io/dataease/service/chart/ChartGroupService.java
+4
-0
ChartViewService.java
...main/java/io/dataease/service/chart/ChartViewService.java
+3
-0
DataSetGroupService.java
...java/io/dataease/service/dataset/DataSetGroupService.java
+4
-0
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+5
-1
没有找到文件。
backend/src/main/java/io/dataease/service/chart/ChartGroupService.java
浏览文件 @
491a0d5d
...
...
@@ -2,6 +2,7 @@ package io.dataease.service.chart;
import
io.dataease.base.domain.*
;
import
io.dataease.base.mapper.ChartGroupMapper
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.controller.request.chart.ChartGroupRequest
;
import
io.dataease.controller.request.dataset.DataSetTableRequest
;
...
...
@@ -28,6 +29,7 @@ public class ChartGroupService {
checkName
(
chartGroup
);
if
(
StringUtils
.
isEmpty
(
chartGroup
.
getId
()))
{
chartGroup
.
setId
(
UUID
.
randomUUID
().
toString
());
chartGroup
.
setCreateBy
(
AuthUtils
.
getUser
().
getUsername
());
chartGroup
.
setCreateTime
(
System
.
currentTimeMillis
());
chartGroupMapper
.
insert
(
chartGroup
);
}
else
{
...
...
@@ -65,6 +67,7 @@ public class ChartGroupService {
public
List
<
ChartGroupDTO
>
tree
(
ChartGroupRequest
ChartGroup
)
{
ChartGroupExample
ChartGroupExample
=
new
ChartGroupExample
();
ChartGroupExample
.
Criteria
criteria
=
ChartGroupExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
ChartGroup
.
getName
()))
{
criteria
.
andNameLike
(
"%"
+
ChartGroup
.
getName
()
+
"%"
);
}
...
...
@@ -92,6 +95,7 @@ public class ChartGroupService {
for
(
ChartGroupDTO
obj
:
list
)
{
ChartGroupExample
ChartGroupExample
=
new
ChartGroupExample
();
ChartGroupExample
.
Criteria
criteria
=
ChartGroupExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
ChartGroup
.
getName
()))
{
criteria
.
andNameLike
(
"%"
+
ChartGroup
.
getName
()
+
"%"
);
}
...
...
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
浏览文件 @
491a0d5d
...
...
@@ -4,6 +4,7 @@ import com.google.gson.Gson;
import
com.google.gson.reflect.TypeToken
;
import
io.dataease.base.domain.*
;
import
io.dataease.base.mapper.ChartViewMapper
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.controller.request.chart.ChartViewRequest
;
import
io.dataease.datasource.constants.DatasourceTypes
;
...
...
@@ -48,6 +49,7 @@ public class ChartViewService {
int
i
=
chartViewMapper
.
updateByPrimaryKeySelective
(
chartView
);
if
(
i
==
0
)
{
chartView
.
setId
(
UUID
.
randomUUID
().
toString
());
chartView
.
setCreateBy
(
AuthUtils
.
getUser
().
getUsername
());
chartView
.
setCreateTime
(
timestamp
);
chartView
.
setUpdateTime
(
timestamp
);
chartViewMapper
.
insert
(
chartView
);
...
...
@@ -58,6 +60,7 @@ public class ChartViewService {
public
List
<
ChartViewWithBLOBs
>
list
(
ChartViewRequest
chartViewRequest
)
{
ChartViewExample
chartViewExample
=
new
ChartViewExample
();
ChartViewExample
.
Criteria
criteria
=
chartViewExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
chartViewRequest
.
getSceneId
()))
{
criteria
.
andSceneIdEqualTo
(
chartViewRequest
.
getSceneId
());
}
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
浏览文件 @
491a0d5d
...
...
@@ -4,6 +4,7 @@ import io.dataease.base.domain.DatasetGroup;
import
io.dataease.base.domain.DatasetGroupExample
;
import
io.dataease.base.domain.DatasetTable
;
import
io.dataease.base.mapper.DatasetGroupMapper
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.controller.request.dataset.DataSetGroupRequest
;
import
io.dataease.controller.request.dataset.DataSetTableRequest
;
...
...
@@ -33,6 +34,7 @@ public class DataSetGroupService {
checkName
(
datasetGroup
);
if
(
StringUtils
.
isEmpty
(
datasetGroup
.
getId
()))
{
datasetGroup
.
setId
(
UUID
.
randomUUID
().
toString
());
datasetGroup
.
setCreateBy
(
AuthUtils
.
getUser
().
getUsername
());
datasetGroup
.
setCreateTime
(
System
.
currentTimeMillis
());
datasetGroupMapper
.
insert
(
datasetGroup
);
}
else
{
...
...
@@ -75,6 +77,7 @@ public class DataSetGroupService {
public
List
<
DataSetGroupDTO
>
tree
(
DataSetGroupRequest
datasetGroup
)
{
DatasetGroupExample
datasetGroupExample
=
new
DatasetGroupExample
();
DatasetGroupExample
.
Criteria
criteria
=
datasetGroupExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
datasetGroup
.
getName
()))
{
criteria
.
andNameLike
(
"%"
+
datasetGroup
.
getName
()
+
"%"
);
}
...
...
@@ -102,6 +105,7 @@ public class DataSetGroupService {
for
(
DataSetGroupDTO
obj
:
list
)
{
DatasetGroupExample
datasetGroupExample
=
new
DatasetGroupExample
();
DatasetGroupExample
.
Criteria
criteria
=
datasetGroupExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
datasetGroup
.
getName
()))
{
criteria
.
andNameLike
(
"%"
+
datasetGroup
.
getName
()
+
"%"
);
}
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
491a0d5d
...
...
@@ -6,6 +6,7 @@ import io.dataease.base.domain.*;
import
io.dataease.base.mapper.DatasetTableIncrementalConfigMapper
;
import
io.dataease.base.mapper.DatasetTableMapper
;
import
io.dataease.base.mapper.DatasourceMapper
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.controller.request.dataset.DataSetTableRequest
;
import
io.dataease.datasource.constants.DatasourceTypes
;
...
...
@@ -51,6 +52,7 @@ public class DataSetTableService {
checkName
(
datasetTable
);
if
(
StringUtils
.
isEmpty
(
datasetTable
.
getId
()))
{
datasetTable
.
setId
(
UUID
.
randomUUID
().
toString
());
datasetTable
.
setCreateBy
(
AuthUtils
.
getUser
().
getUsername
());
datasetTable
.
setCreateTime
(
System
.
currentTimeMillis
());
DataTableInfoDTO
dataTableInfoDTO
=
new
DataTableInfoDTO
();
if
(
StringUtils
.
equalsIgnoreCase
(
"db"
,
datasetTable
.
getType
()))
{
...
...
@@ -77,8 +79,10 @@ public class DataSetTableService {
public
List
<
DatasetTable
>
list
(
DataSetTableRequest
dataSetTableRequest
)
{
DatasetTableExample
datasetTableExample
=
new
DatasetTableExample
();
DatasetTableExample
.
Criteria
criteria
=
datasetTableExample
.
createCriteria
();
criteria
.
andCreateByEqualTo
(
AuthUtils
.
getUser
().
getUsername
());
if
(
StringUtils
.
isNotEmpty
(
dataSetTableRequest
.
getSceneId
()))
{
datasetTableExample
.
createCriteria
()
.
andSceneIdEqualTo
(
dataSetTableRequest
.
getSceneId
());
criteria
.
andSceneIdEqualTo
(
dataSetTableRequest
.
getSceneId
());
}
if
(
StringUtils
.
isNotEmpty
(
dataSetTableRequest
.
getSort
()))
{
datasetTableExample
.
setOrderByClause
(
dataSetTableRequest
.
getSort
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论