最新一版10.0

srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataCollectRecordController.java

@@ -0,0 +1,46 @@
+package net.srt.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import net.srt.convert.MetadataCollectRecordConvert;
+import net.srt.entity.MetadataCollectQuery;
+import net.srt.entity.MetadataCollectRecordEntity;
+import net.srt.framework.common.page.PageResult;
+import net.srt.framework.common.utils.Result;
+import net.srt.query.MetadataCollectRecordQuery;
+import net.srt.service.MetadataCollectRecordService;
+import net.srt.vo.MetadataCollectRecordVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("metadata-collect-record")
+@Tag(name = "数据治理-元数据采集任务记录")
+@AllArgsConstructor
+public class MetadataCollectRecordController {
+    private final MetadataCollectRecordService metadataCollectRecordService;
+
+    @GetMapping("page")
+    @Operation(summary = "分页")
+    public Result<PageResult<MetadataCollectRecordVO>> page(@Valid MetadataCollectRecordQuery query){
+        PageResult<MetadataCollectRecordVO> page = metadataCollectRecordService.page(query);
+        return Result.ok(page);
+    }
+
+    @GetMapping("{id}")
+    @Operation(summary = "信息")
+    public Result<MetadataCollectRecordVO> get(@PathVariable Long id){
+        MetadataCollectRecordEntity entity = metadataCollectRecordService.getById(id);
+        return Result.ok(MetadataCollectRecordConvert.INSTANCE.convert(entity));
+    }
+
+    @DeleteMapping
+    @Operation(summary = "删除")
+    public Result<String> delete(@RequestBody List<Long> idList) {
+        metadataCollectRecordService.delete(idList);
+        return Result.ok();
+    }
+}

srt-cloud-data-governance/src/main/java/net/srt/convert/MetadataCollectRecordConvert.java

@@ -0,0 +1,23 @@
+package net.srt.convert;
+
+import net.srt.api.module.data.governance.dto.DataGovernanceMetadataCollectRecordDto;
+import net.srt.entity.MetadataCollectRecordEntity;
+import net.srt.vo.MetadataCollectRecordVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface MetadataCollectRecordConvert {
+    MetadataCollectRecordConvert INSTANCE = Mappers.getMapper(MetadataCollectRecordConvert.class);
+
+    MetadataCollectRecordEntity convert(MetadataCollectRecordVO vo);
+
+    MetadataCollectRecordEntity convert(DataGovernanceMetadataCollectRecordDto dto);
+
+    MetadataCollectRecordVO convert(MetadataCollectRecordEntity entity);
+
+    List<MetadataCollectRecordVO> convertList(List<MetadataCollectRecordEntity> list);
+
+}

srt-cloud-data-governance/src/main/java/net/srt/dao/MetadataCollectRecordDao.java

@@ -0,0 +1,9 @@
+package net.srt.dao;
+
+import net.srt.entity.MetadataCollectRecordEntity;
+import net.srt.framework.mybatis.dao.BaseDao;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MetadataCollectRecordDao extends BaseDao<MetadataCollectRecordEntity> {
+}

srt-cloud-data-governance/src/main/java/net/srt/entity/MetadataCollectRecordEntity.java

@@ -0,0 +1,51 @@
+package net.srt.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import net.srt.framework.mybatis.entity.BaseEntity;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = false)
+@Data
+@TableName("data_governance_metadata_collect_record")
+public class MetadataCollectRecordEntity extends BaseEntity {
+
+    /**
+     * 采集任务id
+     */
+    private Long metadataCollectId;
+
+    /**
+     * 1-成功 0-失败 2-运行中
+     */
+    private Integer status;
+
+    /**
+     * 实时日志
+     */
+    private String realTimeLog;
+
+    /**
+     * 错误日志
+     */
+    private String errorLog;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 项目（租户）id
+     */
+    private Long projectId;
+
+
+}

srt-cloud-data-governance/src/main/java/net/srt/query/MetadataCollectRecordQuery.java

@@ -0,0 +1,27 @@
+package net.srt.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import net.srt.framework.common.query.Query;
+import net.srt.framework.common.utils.DateUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "数据治理-源数据采集任务记录查询")
+public class MetadataCollectRecordQuery extends Query {
+    private Long metadataCollectId;
+    @Schema(description = "开始时间")
+    @DateTimeFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date startTime;
+    @Schema(description = "结束时间")
+    @DateTimeFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date endTime;
+    private Integer status;
+}

srt-cloud-data-governance/src/main/java/net/srt/service/MetadataCollectRecordService.java

@@ -0,0 +1,16 @@
+package net.srt.service;
+
+import net.srt.entity.MetadataCollectQuery;
+import net.srt.entity.MetadataCollectRecordEntity;
+import net.srt.framework.common.page.PageResult;
+import net.srt.framework.mybatis.service.BaseService;
+import net.srt.query.MetadataCollectRecordQuery;
+import net.srt.vo.MetadataCollectRecordVO;
+
+import java.util.List;
+
+public interface MetadataCollectRecordService extends BaseService<MetadataCollectRecordEntity> {
+    PageResult<MetadataCollectRecordVO> page(MetadataCollectRecordQuery query);
+
+    void delete(List<Long> idList);
+}

srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataCollectRecordServiceImpl.java

@@ -0,0 +1,45 @@
+package net.srt.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import net.srt.convert.MetadataCollectRecordConvert;
+import net.srt.dao.MetadataCollectRecordDao;
+import net.srt.entity.MetadataCollectRecordEntity;
+import net.srt.framework.common.page.PageResult;
+import net.srt.framework.mybatis.service.impl.BaseServiceImpl;
+import net.srt.query.MetadataCollectRecordQuery;
+import net.srt.service.MetadataCollectRecordService;
+import net.srt.vo.MetadataCollectRecordVO;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class MetadataCollectRecordServiceImpl extends BaseServiceImpl<MetadataCollectRecordDao, MetadataCollectRecordEntity> implements MetadataCollectRecordService {
+    @Override
+    public PageResult<MetadataCollectRecordVO> page(MetadataCollectRecordQuery query) {
+        IPage<MetadataCollectRecordEntity> page = baseMapper.selectPage(getPage(query),getWrapper(query));
+        return new PageResult<>(MetadataCollectRecordConvert.INSTANCE.convertList(page.getRecords()),page.getTotal());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(List<Long> idList) {
+        removeByIds(idList);
+    }
+
+    private LambdaQueryWrapper<MetadataCollectRecordEntity> getWrapper(MetadataCollectRecordQuery query) {
+        LambdaQueryWrapper<MetadataCollectRecordEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(query.getMetadataCollectId() != null,MetadataCollectRecordEntity::getMetadataCollectId,query.getMetadataCollectId())
+                .eq(query.getStatus() != null, MetadataCollectRecordEntity::getStatus,query.getStatus())
+                .gt(query.getStartTime()!=null,MetadataCollectRecordEntity::getStartTime,query.getStartTime())
+                .lt(query.getEndTime()!=null,MetadataCollectRecordEntity::getEndTime,query.getEndTime())
+                .orderByDesc(MetadataCollectRecordEntity::getId);
+        return wrapper;
+    }
+
+}

srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataCollectServiceImpl.java

@@ -10,8 +10,10 @@ import net.srt.api.module.data.governance.constant.MetadataCollectType;
 import net.srt.api.module.quartz.QuartzDataGovernanceMetadataCollectApi;
 import net.srt.convert.MetadataCollectConvert;
 import net.srt.dao.MetadataCollectDao;
+import net.srt.dao.MetadataCollectRecordDao;
 import net.srt.entity.MetadataCollectEntity;
 import net.srt.entity.MetadataCollectQuery;
+import net.srt.entity.MetadataCollectRecordEntity;
 import net.srt.framework.common.exception.ServerException;
 import net.srt.framework.common.page.PageResult;
 import net.srt.framework.mybatis.service.impl.BaseServiceImpl;
@@ -29,6 +31,7 @@ import java.util.List;
 public class MetadataCollectServiceImpl extends BaseServiceImpl<MetadataCollectDao, MetadataCollectEntity> implements MetadataCollectService {
 
     private final QuartzDataGovernanceMetadataCollectApi metadataCollectApi;
+    private final MetadataCollectRecordDao collectRecordDao;
 
     @Override
     public PageResult<MetadataCollectVO> page(MetadataCollectQuery query) {
@@ -78,10 +81,12 @@ public class MetadataCollectServiceImpl extends BaseServiceImpl<MetadataCollectD
     @Override
     public void delete(List<Long> idList) {
         removeByIds(idList);
-//        for (Long id : idList) {
-//            LambdaQueryWrapper<MetadataCollectEntity> wrapper = Wrappers.lambdaQuery();
-//
-//        }
+
+        for (Long id : idList) {
+            LambdaQueryWrapper<MetadataCollectRecordEntity> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(MetadataCollectRecordEntity::getMetadataCollectId,id);
+            collectRecordDao.delete(wrapper);
+        }
     }
 
     private void checkParam(MetadataCollectVO vo){

srt-cloud-data-governance/src/main/java/net/srt/vo/MetadataCollectRecordVO.java

@@ -0,0 +1,64 @@
+package net.srt.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import net.srt.framework.common.utils.DateUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Schema(description = "数据治理-元数据采集任务记录")
+public class MetadataCollectRecordVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键id")
+    private Long id;
+
+    @Schema(description = "采集任务id")
+    private Long metadataCollectId;
+
+    @Schema(description = "1-成功 0-失败 2-运行中")
+    private Integer status;
+
+    @Schema(description = "实时日志")
+    private String realTimeLog;
+
+    @Schema(description = "错误日志")
+    private String errorLog;
+
+    @Schema(description = "开始时间")
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date startTime;
+
+    @Schema(description = "结束时间")
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date endTime;
+
+    @Schema(description = "项目（租户）id")
+    private Long projectId;
+
+    @Schema(description = "版本号")
+    private Integer version;
+
+    @Schema(description = "删除标识  0：正常   1：已删除")
+    private Integer deleted;
+
+    @Schema(description = "创建者")
+    private Long creator;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date createTime;
+
+    @Schema(description = "更新者")
+    private Long updater;
+
+    @Schema(description = "更新时间")
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
+    private Date updateTime;
+
+
+
+}