public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-21 04:08:10 +08:00
Code Issues Packages Projects Releases Wiki 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
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);
}
}