Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
ec4dcf93
提交
ec4dcf93
authored
6月 16, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 清理临时文件
上级
064b0fe8
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
94 行增加
和
6 行删除
+94
-6
Dockerfile
Dockerfile
+1
-1
DatasetTable.java
...d/src/main/java/io/dataease/base/domain/DatasetTable.java
+2
-0
DatasetTableExample.java
...ain/java/io/dataease/base/domain/DatasetTableExample.java
+60
-0
DatasetTableMapper.xml
.../main/java/io/dataease/base/mapper/DatasetTableMapper.xml
+25
-5
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+5
-0
ExtractDataService.java
.../java/io/dataease/service/dataset/ExtractDataService.java
+0
-0
V7__alter_dataset_table.sql
...c/main/resources/db/migration/V7__alter_dataset_table.sql
+1
-0
没有找到文件。
Dockerfile
浏览文件 @
ec4dcf93
FROM
registry.
fit2cloud
.com/fit2cloud3/fabric8-java-alpine-openjdk8-jre
FROM
registry.
cn-qingdao.aliyuncs
.com/fit2cloud3/fabric8-java-alpine-openjdk8-jre
ARG
IMAGE_TAG
ARG
IMAGE_TAG
...
...
backend/src/main/java/io/dataease/base/domain/DatasetTable.java
浏览文件 @
ec4dcf93
...
@@ -25,6 +25,8 @@ public class DatasetTable implements Serializable {
...
@@ -25,6 +25,8 @@ public class DatasetTable implements Serializable {
private
String
syncStatus
;
private
String
syncStatus
;
private
Long
lastUpdateTime
;
private
String
info
;
private
String
info
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
...
backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java
浏览文件 @
ec4dcf93
...
@@ -783,6 +783,66 @@ public class DatasetTableExample {
...
@@ -783,6 +783,66 @@ public class DatasetTableExample {
addCriterion
(
"sync_status not between"
,
value1
,
value2
,
"syncStatus"
);
addCriterion
(
"sync_status not between"
,
value1
,
value2
,
"syncStatus"
);
return
(
Criteria
)
this
;
return
(
Criteria
)
this
;
}
}
public
Criteria
andLastUpdateTimeIsNull
()
{
addCriterion
(
"last_update_time is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeIsNotNull
()
{
addCriterion
(
"last_update_time is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeEqualTo
(
Long
value
)
{
addCriterion
(
"last_update_time ="
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeNotEqualTo
(
Long
value
)
{
addCriterion
(
"last_update_time <>"
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeGreaterThan
(
Long
value
)
{
addCriterion
(
"last_update_time >"
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeGreaterThanOrEqualTo
(
Long
value
)
{
addCriterion
(
"last_update_time >="
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeLessThan
(
Long
value
)
{
addCriterion
(
"last_update_time <"
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeLessThanOrEqualTo
(
Long
value
)
{
addCriterion
(
"last_update_time <="
,
value
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeIn
(
List
<
Long
>
values
)
{
addCriterion
(
"last_update_time in"
,
values
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeNotIn
(
List
<
Long
>
values
)
{
addCriterion
(
"last_update_time not in"
,
values
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeBetween
(
Long
value1
,
Long
value2
)
{
addCriterion
(
"last_update_time between"
,
value1
,
value2
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastUpdateTimeNotBetween
(
Long
value1
,
Long
value2
)
{
addCriterion
(
"last_update_time not between"
,
value1
,
value2
,
"lastUpdateTime"
);
return
(
Criteria
)
this
;
}
}
}
public
static
class
Criteria
extends
GeneratedCriteria
{
public
static
class
Criteria
extends
GeneratedCriteria
{
...
...
backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml
浏览文件 @
ec4dcf93
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
<result
column=
"create_time"
jdbcType=
"BIGINT"
property=
"createTime"
/>
<result
column=
"create_time"
jdbcType=
"BIGINT"
property=
"createTime"
/>
<result
column=
"qrtz_instance"
jdbcType=
"VARCHAR"
property=
"qrtzInstance"
/>
<result
column=
"qrtz_instance"
jdbcType=
"VARCHAR"
property=
"qrtzInstance"
/>
<result
column=
"sync_status"
jdbcType=
"VARCHAR"
property=
"syncStatus"
/>
<result
column=
"sync_status"
jdbcType=
"VARCHAR"
property=
"syncStatus"
/>
<result
column=
"last_update_time"
jdbcType=
"BIGINT"
property=
"lastUpdateTime"
/>
</resultMap>
</resultMap>
<resultMap
extends=
"BaseResultMap"
id=
"ResultMapWithBLOBs"
type=
"io.dataease.base.domain.DatasetTable"
>
<resultMap
extends=
"BaseResultMap"
id=
"ResultMapWithBLOBs"
type=
"io.dataease.base.domain.DatasetTable"
>
<result
column=
"info"
jdbcType=
"LONGVARCHAR"
property=
"info"
/>
<result
column=
"info"
jdbcType=
"LONGVARCHAR"
property=
"info"
/>
...
@@ -76,7 +77,7 @@
...
@@ -76,7 +77,7 @@
</sql>
</sql>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, `name`, scene_id, data_source_id, `type`, `mode`, create_by, create_time, qrtz_instance,
id, `name`, scene_id, data_source_id, `type`, `mode`, create_by, create_time, qrtz_instance,
sync_status
sync_status
, last_update_time
</sql>
</sql>
<sql
id=
"Blob_Column_List"
>
<sql
id=
"Blob_Column_List"
>
info
info
...
@@ -133,11 +134,13 @@
...
@@ -133,11 +134,13 @@
insert into dataset_table (id, `name`, scene_id,
insert into dataset_table (id, `name`, scene_id,
data_source_id, `type`, `mode`,
data_source_id, `type`, `mode`,
create_by, create_time, qrtz_instance,
create_by, create_time, qrtz_instance,
sync_status, info)
sync_status, last_update_time, info
)
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR},
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR},
#{dataSourceId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{mode,jdbcType=INTEGER},
#{dataSourceId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{mode,jdbcType=INTEGER},
#{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{qrtzInstance,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{qrtzInstance,jdbcType=VARCHAR},
#{syncStatus,jdbcType=VARCHAR}, #{info,jdbcType=LONGVARCHAR})
#{syncStatus,jdbcType=VARCHAR}, #{lastUpdateTime,jdbcType=BIGINT}, #{info,jdbcType=LONGVARCHAR}
)
</insert>
</insert>
<insert
id=
"insertSelective"
parameterType=
"io.dataease.base.domain.DatasetTable"
>
<insert
id=
"insertSelective"
parameterType=
"io.dataease.base.domain.DatasetTable"
>
insert into dataset_table
insert into dataset_table
...
@@ -172,6 +175,9 @@
...
@@ -172,6 +175,9 @@
<if
test=
"syncStatus != null"
>
<if
test=
"syncStatus != null"
>
sync_status,
sync_status,
</if>
</if>
<if
test=
"lastUpdateTime != null"
>
last_update_time,
</if>
<if
test=
"info != null"
>
<if
test=
"info != null"
>
info,
info,
</if>
</if>
...
@@ -207,6 +213,9 @@
...
@@ -207,6 +213,9 @@
<if
test=
"syncStatus != null"
>
<if
test=
"syncStatus != null"
>
#{syncStatus,jdbcType=VARCHAR},
#{syncStatus,jdbcType=VARCHAR},
</if>
</if>
<if
test=
"lastUpdateTime != null"
>
#{lastUpdateTime,jdbcType=BIGINT},
</if>
<if
test=
"info != null"
>
<if
test=
"info != null"
>
#{info,jdbcType=LONGVARCHAR},
#{info,jdbcType=LONGVARCHAR},
</if>
</if>
...
@@ -251,6 +260,9 @@
...
@@ -251,6 +260,9 @@
<if
test=
"record.syncStatus != null"
>
<if
test=
"record.syncStatus != null"
>
sync_status = #{record.syncStatus,jdbcType=VARCHAR},
sync_status = #{record.syncStatus,jdbcType=VARCHAR},
</if>
</if>
<if
test=
"record.lastUpdateTime != null"
>
last_update_time = #{record.lastUpdateTime,jdbcType=BIGINT},
</if>
<if
test=
"record.info != null"
>
<if
test=
"record.info != null"
>
info = #{record.info,jdbcType=LONGVARCHAR},
info = #{record.info,jdbcType=LONGVARCHAR},
</if>
</if>
...
@@ -271,6 +283,7 @@
...
@@ -271,6 +283,7 @@
create_time = #{record.createTime,jdbcType=BIGINT},
create_time = #{record.createTime,jdbcType=BIGINT},
qrtz_instance = #{record.qrtzInstance,jdbcType=VARCHAR},
qrtz_instance = #{record.qrtzInstance,jdbcType=VARCHAR},
sync_status = #{record.syncStatus,jdbcType=VARCHAR},
sync_status = #{record.syncStatus,jdbcType=VARCHAR},
last_update_time = #{record.lastUpdateTime,jdbcType=BIGINT},
info = #{record.info,jdbcType=LONGVARCHAR}
info = #{record.info,jdbcType=LONGVARCHAR}
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
...
@@ -287,7 +300,8 @@
...
@@ -287,7 +300,8 @@
create_by = #{record.createBy,jdbcType=VARCHAR},
create_by = #{record.createBy,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
create_time = #{record.createTime,jdbcType=BIGINT},
qrtz_instance = #{record.qrtzInstance,jdbcType=VARCHAR},
qrtz_instance = #{record.qrtzInstance,jdbcType=VARCHAR},
sync_status = #{record.syncStatus,jdbcType=VARCHAR}
sync_status = #{record.syncStatus,jdbcType=VARCHAR},
last_update_time = #{record.lastUpdateTime,jdbcType=BIGINT}
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
</if>
...
@@ -322,6 +336,9 @@
...
@@ -322,6 +336,9 @@
<if
test=
"syncStatus != null"
>
<if
test=
"syncStatus != null"
>
sync_status = #{syncStatus,jdbcType=VARCHAR},
sync_status = #{syncStatus,jdbcType=VARCHAR},
</if>
</if>
<if
test=
"lastUpdateTime != null"
>
last_update_time = #{lastUpdateTime,jdbcType=BIGINT},
</if>
<if
test=
"info != null"
>
<if
test=
"info != null"
>
info = #{info,jdbcType=LONGVARCHAR},
info = #{info,jdbcType=LONGVARCHAR},
</if>
</if>
...
@@ -339,6 +356,7 @@
...
@@ -339,6 +356,7 @@
create_time = #{createTime,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=BIGINT},
qrtz_instance = #{qrtzInstance,jdbcType=VARCHAR},
qrtz_instance = #{qrtzInstance,jdbcType=VARCHAR},
sync_status = #{syncStatus,jdbcType=VARCHAR},
sync_status = #{syncStatus,jdbcType=VARCHAR},
last_update_time = #{lastUpdateTime,jdbcType=BIGINT},
info = #{info,jdbcType=LONGVARCHAR}
info = #{info,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</update>
...
@@ -352,7 +370,8 @@
...
@@ -352,7 +370,8 @@
create_by = #{createBy,jdbcType=VARCHAR},
create_by = #{createBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=BIGINT},
qrtz_instance = #{qrtzInstance,jdbcType=VARCHAR},
qrtz_instance = #{qrtzInstance,jdbcType=VARCHAR},
sync_status = #{syncStatus,jdbcType=VARCHAR}
sync_status = #{syncStatus,jdbcType=VARCHAR},
last_update_time = #{lastUpdateTime,jdbcType=BIGINT}
where id = #{id,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</update>
</mapper>
</mapper>
\ No newline at end of file
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
ec4dcf93
...
@@ -1055,6 +1055,11 @@ public class DataSetTableService {
...
@@ -1055,6 +1055,11 @@ public class DataSetTableService {
DatasetTableTaskLogExample
datasetTableTaskLogExample
=
new
DatasetTableTaskLogExample
();
DatasetTableTaskLogExample
datasetTableTaskLogExample
=
new
DatasetTableTaskLogExample
();
datasetTableTaskLogExample
.
createCriteria
().
andStatusEqualTo
(
JobStatus
.
Underway
.
name
()).
andTableIdIn
(
jobStoppeddDatasetTables
.
stream
().
map
(
DatasetTable:
:
getId
).
collect
(
Collectors
.
toList
()));
datasetTableTaskLogExample
.
createCriteria
().
andStatusEqualTo
(
JobStatus
.
Underway
.
name
()).
andTableIdIn
(
jobStoppeddDatasetTables
.
stream
().
map
(
DatasetTable:
:
getId
).
collect
(
Collectors
.
toList
()));
datasetTableTaskLogMapper
.
updateByExampleSelective
(
datasetTableTaskLog
,
datasetTableTaskLogExample
);
datasetTableTaskLogMapper
.
updateByExampleSelective
(
datasetTableTaskLog
,
datasetTableTaskLogExample
);
for
(
DatasetTable
jobStoppeddDatasetTable
:
jobStoppeddDatasetTables
)
{
extractDataService
.
deleteFile
(
"all_scope"
,
jobStoppeddDatasetTable
.
getId
());
extractDataService
.
deleteFile
(
"incremental_add"
,
jobStoppeddDatasetTable
.
getId
());
extractDataService
.
deleteFile
(
"incremental_delete"
,
jobStoppeddDatasetTable
.
getId
());
}
}
}
}
}
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
浏览文件 @
ec4dcf93
差异被折叠。
点击展开。
backend/src/main/resources/db/migration/V7__alter_dataset_table.sql
0 → 100644
浏览文件 @
ec4dcf93
ALTER
TABLE
`dataset_table`
ADD
COLUMN
`last_update_time`
BIGINT
(
13
)
NULL
DEFAULT
0
AFTER
`sync_status`
;
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论