From 9cda37b56cecae7aa21f7095c80a7f5d3f0ec879 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 9 Mar 2021 16:04:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtDataSetTaskMapper.java | 17 +++++ .../base/mapper/ext/ExtDataSetTaskMapper.xml | 18 ++++++ .../DataSetTableTaskLogController.java | 13 ++++ .../dto/dataset/DataSetTaskLogDTO.java | 15 +++++ .../dataset/DataSetTableTaskLogService.java | 15 +++++ frontend/src/lang/zh.js | 4 +- frontend/src/views/chart/view/ChartEdit.vue | 4 +- .../src/views/dataset/data/UpdateInfo.vue | 63 +++++++++---------- 8 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml create mode 100644 backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java new file mode 100644 index 0000000000..870cc1863d --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java @@ -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 list(DatasetTableTaskLog request); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml new file mode 100644 index 0000000000..6959563916 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java index 6005616f85..a37316413e 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java @@ -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(@RequestBody DatasetTableTaskLog request, @PathVariable int goPage, @PathVariable int pageSize) { + Page page = PageHelper.startPage(goPage, pageSize, true); + return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request)); + } + } diff --git a/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java new file mode 100644 index 0000000000..41dc1213fa --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/dataset/DataSetTaskLogDTO.java @@ -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; +} diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java index 07df4dab74..fe687d4f75 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java @@ -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 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); + } } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7c598c6df1..c70fce5650 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -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: '分组', diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 79e4fa4982..ad4d8bc2f6 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -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) { diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index c99205089b..7742bd192b 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -8,7 +8,7 @@ @@ -19,11 +19,19 @@ + > + + + > + + @@ -101,7 +109,7 @@ - + @@ -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 = {