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

feat(数据集): 定时更新：更新日志列表展示

Browse Source
This commit is contained in:
junjie 2021-03-09 16:04:16 +08:00
parent 2fe3e8100d
commit 9cda37b56c
8 changed files with 113 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java Normal file
View File

@ -0,0 +1,17 @@
package io.dataease.base.mapper.ext;
import io.dataease.base.domain.DatasetTableTaskLog;
import io.dataease.dto.dataset.DataSetTaskLogDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @Author gin
* @Date 2021/3/9 3:26 下午
*/
@Mapper
public interface ExtDataSetTaskMapper {
List<DataSetTaskLogDTO> list(DatasetTableTaskLog request);
}

18
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="io.dataease.base.mapper.ext.ExtDataSetTaskMapper">
<resultMap id="BaseResult" type="io.dataease.dto.dataset.DataSetTaskLogDTO"
extends="io.dataease.base.mapper.DatasetTableTaskLogMapper.BaseResultMap">
<result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap>
<select id="list" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
SELECT dataset_table_task_log.*,
dataset_table_task.name
FROM dataset_table_task_log
LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
WHERE dataset_table_task_log.table_id = #{tableId,jdbcType=VARCHAR}
</select>
</mapper>

13
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java
View File

@ -1,10 +1,17 @@
package io.dataease.controller.dataset;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.dataease.base.domain.DatasetTableTaskLog;
import io.dataease.base.domain.Datasource;
import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager;
import io.dataease.dto.dataset.DataSetTaskLogDTO;
import io.dataease.service.dataset.DataSetTableTaskLogService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author gin
@ -26,4 +33,10 @@ public class DataSetTableTaskLogController {
dataSetTableTaskLogService.delete(id);
}
@PostMapping("list/{goPage}/{pageSize}")
public Pager<List<DataSetTaskLogDTO>> list(@RequestBody DatasetTableTaskLog request, @PathVariable int goPage, @PathVariable int pageSize) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request));
}
}

15
backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java Normal file
View File

@ -0,0 +1,15 @@
package io.dataease.dto.dataset;
import io.dataease.base.domain.DatasetTableTaskLog;
import lombok.Getter;
import lombok.Setter;
/**
* @Author gin
* @Date 2021/3/9 3:19 下午
*/
@Getter
@Setter
public class DataSetTaskLogDTO extends DatasetTableTaskLog {
private String name;
}

15
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
View File

@ -1,11 +1,15 @@
package io.dataease.service.dataset;
import io.dataease.base.domain.DatasetTableTaskLog;
import io.dataease.base.domain.DatasetTableTaskLogExample;
import io.dataease.base.mapper.DatasetTableTaskLogMapper;
import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
import io.dataease.dto.dataset.DataSetTaskLogDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.UUID;
/**
@ -16,6 +20,8 @@ import java.util.UUID;
public class DataSetTableTaskLogService {
@Resource
private DatasetTableTaskLogMapper datasetTableTaskLogMapper;
@Resource
private ExtDataSetTaskMapper extDataSetTaskMapper;
public DatasetTableTaskLog save(DatasetTableTaskLog datasetTableTaskLog) {
if (StringUtils.isEmpty(datasetTableTaskLog.getId())) {
@ -32,5 +38,14 @@ public class DataSetTableTaskLogService {
datasetTableTaskLogMapper.deleteByPrimaryKey(id);
}
public List<DataSetTaskLogDTO> list(DatasetTableTaskLog request) {
DatasetTableTaskLogExample datasetTableTaskLogExample = new DatasetTableTaskLogExample();
DatasetTableTaskLogExample.Criteria criteria = datasetTableTaskLogExample.createCriteria();
if (StringUtils.isNotEmpty(request.getTableId())) {
criteria.andTableIdEqualTo(request.getTableId());
}
datasetTableTaskLogExample.setOrderByClause("create_time desc");
return extDataSetTaskMapper.list(request);
}
}

4
frontend/src/lang/zh.js
View File

@ -548,7 +548,7 @@ export default {
auth_name_valid: '名称不支持特殊字符'
},
chart: {
datalist: '视图列表',
datalist: '视图',
add_group: '添加分组',
add_scene: '添加场景',
group: '分组',
@ -590,7 +590,7 @@ export default {
chart: '视图'
},
dataset: {
datalist: '数据列表',
datalist: '数据集',
add_group: '添加分组',
add_scene: '添加场景',
group: '分组',

4
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -253,10 +253,10 @@ export default {
}
},
clear1(index) {
this.view.xaxis.splice(this.view.xaxis.indexOf(index), 1)
this.view.xaxis.splice(index, 1)
},
clear2(index) {
this.view.yaxis.splice(this.view.yaxis.indexOf(index), 1)
this.view.yaxis.splice(index, 1)
},
get(id) {
if (id) {

63
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -8,7 +8,7 @@
<el-row style="margin-top: 10px;">
<el-table
size="mini"
:data="tableData"
:data="taskLogData"
border
style="width: 100%"
>
@ -19,11 +19,19 @@
<el-table-column
prop="startTime"
:label="$t('dataset.start_time')"
/>
>
<template slot-scope="scope">
<span>{{ scope.row.startTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
:label="$t('dataset.end_time')"
/>
>
<template slot-scope="scope">
<span>{{ scope.row.endTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<el-table-column
prop="status"
:label="$t('dataset.status')"
@ -31,11 +39,11 @@
</el-table>
<el-row style="margin-top: 10px;text-align: right;">
<el-pagination
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:current-page="page.currentPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="1000"
:total="page.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@ -101,7 +109,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="taskForm.rate === '1'" label="">
<el-input v-model="taskForm.cron" size="mini" style="width: 50%" />
<el-input v-model="taskForm.cron" size="mini" style="width: 50%"/>
</el-form-item>
<el-form-item :label="$t('dataset.end_time')" prop="end">
<el-select v-model="taskForm.end" size="mini" :disabled="taskForm.rate === '0'">
@ -206,7 +214,6 @@ export default {
return {
update_setting: false,
update_task: false,
currentPage: 1,
taskForm: {
name: '',
type: '0',
@ -216,27 +223,12 @@ export default {
endTime: '',
end: '0'
},
tableData: [{
startTime: '2016-05-02 00:00:00',
endTime: '2016-05-02 00:00:10',
name: '每天0点更新',
status: '更新成功'
}, {
startTime: '2016-05-02 00:00:00',
endTime: '2016-05-02 00:00:10',
name: '手动更新',
status: '更新成功'
}, {
startTime: '2016-05-02 00:00:00',
endTime: '2016-05-02 00:00:10',
name: '每天0点更新',
status: '更新成功'
}, {
startTime: '2016-05-02 00:00:00',
endTime: '2016-05-02 00:00:10',
name: '每天0点更新',
status: '更新成功'
}],
page: {
currentPage: 1,
pageSize: 10,
total: 0
},
taskLogData: [],
taskData: [],
taskFormRules: {
name: [
@ -260,6 +252,7 @@ export default {
watch: {
table() {
this.listTask()
this.listTaskLog()
}
},
methods: {
@ -338,11 +331,17 @@ export default {
this.taskForm.cron = ''
}
},
listTaskLog() {
post('/dataset/taskLog/list/' + this.page.currentPage + '/' + this.page.pageSize, { tableId: this.table.id }).then(response => {
this.taskLogData = response.data.listObject
this.page.total = response.data.itemCount
})
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`)
this.listTaskLog()
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`)
this.listTaskLog()
},
resetTaskForm() {
this.taskForm = {