数据汇聚、数据汇聚日志查询修改

dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCollectController.java

 package com.zq.dataoperation.controller;
 
 
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.ResultVo;
+//import com.zq.dataoperation.service.DataCleanService;
+import com.zq.dataoperation.entity.DataCollect;
+import com.zq.dataoperation.service.DataCollectService;
+import com.zq.dataoperation.vo.DataCollectReq;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 
 @Api(tags = "数据汇聚")
 @RequiredArgsConstructor
@@ -13,56 +23,50 @@ import org.springframework.web.bind.annotation.*;
 public class DataCollectController {
 
 
-//    @Resource
-//    private DataCollectService dataCollectService;
+    @Resource
+    private DataCollectService dataCollectService;
 //    @Resource
 //    private DataCleanService dataCleanService;
-//
-//    @ApiOperation("获取数据汇聚任务列表")
-//    @PostMapping(value = "/dataCollectList")
-//    public ResultVo selectDataCollectList(@RequestBody DataCollectTaskVo vo) {
-//        return ResultVo.success(dataCollectService.selectDataCollectList(vo));
-//    }
-//
-//    @ApiOperation("根据ID获取数据汇聚任务详情")
-//    @GetMapping(value = "/getById")
-//    public ResultVo selectById(@RequestParam Long id) {
-//        return ResultVo.success(dataCollectService.getById(id));
-//    }
-//
-//    @ApiOperation("获取数据汇聚详情")
-//    @PostMapping(value = "/dataCollectDetails")
-//    public ResultVo getDataCollectDetails(@RequestBody DataCollectTaskLogVo vo) {
-//        return ResultVo.success(dataCollectService.getDataCollectDetails(vo));
-//    }
-//
-//    @ApiOperation("数据清洗记录列表")
-//    @PostMapping(value = "/dataCleanList")
-//    public ResultVo selectDataCleanList(@RequestBody CleanRecordLogVo vo) {
-//        return ResultVo.success(dataCleanService.selectDataCleanList(vo));
-//    }
-//
-//    @ApiOperation("新增或修改数据汇聚设置")
-//    @PostMapping(value = "/update")
-//    public ResultVo selectDataCleanList(@RequestBody DataCollectTask dataCollectTask) {
-//        boolean b = dataCollectService.saveOrUpdate(dataCollectTask);
-//        AssertUtils.isTrue(b, "操作失败");
-//        return ResultVo.success("操作成功");
-//    }
-//
-//    @ApiOperation("删除数据汇聚设置")
-//    @DeleteMapping(value = "/delete/{id}")
-//    public ResultVo delete(@PathVariable Integer id) {
-//        boolean b = dataCollectService.removeById(id);
-//        AssertUtils.isTrue(b, "操作失败");
-//        return ResultVo.success("操作成功");
-//    }
-//
-//    @ApiOperation("批量删除数据汇聚设置")
-//    @DeleteMapping(value = "/batchDelete")
-//    public ResultVo batchDelete(@RequestBody List<Long> ids) {
-//        boolean b = dataCollectService.removeByIds(ids);
-//        AssertUtils.isTrue(b, "操作失败");
-//        return ResultVo.success("操作成功");
-//    }
+
+    @ApiOperation("获取数据汇聚任务列表")
+    @GetMapping(value = "/getAll")
+    public ResultVo getDataCollectList() {
+        return ResultVo.success(dataCollectService.list());
+    }
+
+    @ApiOperation("根据ID获取数据汇聚任务")
+    @GetMapping(value = "/getById")
+    public ResultVo selectById(@RequestParam Long id) {
+        return ResultVo.success(dataCollectService.getById(id));
+    }
+
+    @ApiOperation("分页获取数据汇聚任务")
+    @PostMapping(value = "/getPageDataCollect")
+    public ResultVo getDataCollectDetails(@RequestBody DataCollectReq req) {
+        return ResultVo.success(dataCollectService.getPageDataCollect(req));
+    }
+
+    @ApiOperation("新增或修改数据汇聚设置")
+    @PostMapping(value = "/update")
+    public ResultVo selectDataCleanList(@RequestBody DataCollect dataCollect) {
+        boolean b = dataCollectService.saveOrUpdate(dataCollect);
+        AssertUtils.isTrue(b, "操作失败");
+        return ResultVo.success("操作成功");
+    }
+
+    @ApiOperation("删除数据汇聚设置")
+    @DeleteMapping(value = "/delete/{id}")
+    public ResultVo delete(@PathVariable Integer id) {
+        boolean b = dataCollectService.removeById(id);
+        AssertUtils.isTrue(b, "操作失败");
+        return ResultVo.success("操作成功");
+    }
+
+    @ApiOperation("批量删除数据汇聚设置")
+    @DeleteMapping(value = "/batchDelete")
+    public ResultVo batchDelete(@RequestBody List<Long> ids) {
+        boolean b = dataCollectService.removeByIds(ids);
+        AssertUtils.isTrue(b, "操作失败");
+        return ResultVo.success("操作成功");
+    }
 }

dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCollectLogController.java

+package com.zq.dataoperation.controller;
+
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.ResultVo;
+import com.zq.dataoperation.vo.DataCollectLogReq;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.zq.dataoperation.service.DataCollectLogService;
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "数据汇聚日志")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/data/collect/log")
+public class DataCollectLogController {
+
+    @Resource
+    private DataCollectLogService dataCollectLogService;
+
+    @ApiOperation("获取数据汇聚日志列表")
+    @GetMapping(value = "/getAll")
+    public ResultVo getDataCollectList() {
+        return ResultVo.success(dataCollectLogService.list());
+    }
+
+    @ApiOperation("分页获取数据汇聚日志")
+    @PostMapping(value = "/getPageDataCollectLog")
+    public ResultVo getDataCollectDetails(@RequestBody DataCollectLogReq req) {
+        return ResultVo.success(dataCollectLogService.getPageDataCollectLog(req));
+    }
+
+    @ApiOperation("删除数据汇聚日志")
+    @DeleteMapping(value = "/delete/{id}")
+    public ResultVo delete(@PathVariable Integer id) {
+        boolean b = dataCollectLogService.removeById(id);
+        AssertUtils.isTrue(b, "操作失败");
+        return ResultVo.success("操作成功");
+    }
+
+    @ApiOperation("批量删除数据汇聚设置")
+    @DeleteMapping(value = "/batchDelete")
+    public ResultVo batchDelete(@RequestBody List<Long> ids) {
+        boolean b = dataCollectLogService.removeByIds(ids);
+        AssertUtils.isTrue(b, "操作失败");
+        return ResultVo.success("操作成功");
+    }
+
+}

dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCollectDao.java

+package com.zq.dataoperation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.dataoperation.entity.DataCollect;
+
+public interface DataCollectDao extends BaseMapper<DataCollect> {
+}

dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCollectLogDao.java

+package com.zq.dataoperation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.dataoperation.entity.DataCollectLog;
+
+public interface DataCollectLogDao extends BaseMapper<DataCollectLog> {
+}

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCollect.java

+package com.zq.dataoperation.entity;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataCollect {
+
+    /**
+     * 数据类型
+     * 1.数据库 2.文件 3.接口 4网站
+     */
+    private Integer dataType;
+
+    /**
+     * 汇聚类型
+     * 1.一次性导入 2.增量导入
+     */
+    private Integer collectType;
+
+    /**
+     * 是否手工导入
+     * 0否 1是
+     */
+    private Boolean isManually;
+
+    /**
+     * 汇聚到的数据表名
+     * 如果是非结构化文件，可以不存入数据表
+     */
+    private String toTable;
+
+    /**
+     * 汇聚任务的名称
+     */
+    private String taskName;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 执行计划的corn表达式
+     * 写执行的corn表达式
+     */
+    private String cron;
+
+    /**
+     * 是否运行的开关
+     * 0否 1是
+     */
+    private Boolean runFlag;
+
+    /**
+     * createTime
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * updateTime
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}
+

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCollectLog.java

+package com.zq.dataoperation.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataCollectLog {
+
+    /**
+     * 数据汇聚表id
+     */
+    private Integer dataCollectSettingId;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 花费多少秒
+     */
+    private Integer duration;
+
+    /**
+     * 状态
+     * 1运行中 2正常结束 3异常终止
+     */
+    private Integer status;
+
+    /**
+     * 错误信息
+     * 异常终止时记录异常信息
+     */
+    private String error;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * createTime
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * updateTime
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}
+

dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCollectLogService.java

+package com.zq.dataoperation.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zq.common.utils.PagingUtils;
+import com.zq.common.vo.PageVo;
+import com.zq.dataoperation.dao.DataCollectLogDao;
+import com.zq.dataoperation.entity.DataCollectLog;
+import com.zq.dataoperation.vo.DataCollectLogReq;
+
+
+import javax.annotation.Resource;
+
+public class DataCollectLogService extends ServiceImpl<DataCollectLogDao, DataCollectLog> {
+
+    @Resource DataCollectLogDao dataCollectLogDao;
+
+    public PageVo<DataCollectLog> getPageDataCollectLog(DataCollectLogReq req) {
+        LambdaQueryWrapper<DataCollectLog> wrapper = new LambdaQueryWrapper<>();
+        return PagingUtils.paging(req,dataCollectLogDao,DataCollectLog.class,wrapper);
+
+    }
+}

dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCollectService.java

 package com.zq.dataoperation.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zq.common.utils.PagingUtils;
+import com.zq.common.vo.PageVo;
+import com.zq.dataoperation.dao.DataCollectDao;
+import com.zq.dataoperation.entity.DataCollect;
+import com.zq.dataoperation.vo.DataCollectReq;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class DataCollectService {
+public class DataCollectService extends ServiceImpl<DataCollectDao, DataCollect> {
+
+    @Resource
+    private DataCollectDao dataCollectDao;
+
+    public PageVo<DataCollect> getPageDataCollect(DataCollectReq req) {
+        LambdaQueryWrapper<DataCollect> wrapper = new LambdaQueryWrapper<>();
+        return PagingUtils.paging(req,dataCollectDao,DataCollect.class,wrapper);
+
+    }
 
 }
\ No newline at end of file

dataoperation-server/src/main/java/com/zq/dataoperation/vo/DataCollectLogReq.java

+package com.zq.dataoperation.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zq.common.vo.PageReqVo;
+import com.zq.common.vo.PageVo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DataCollectLogReq extends PageReqVo {
+    /**
+     * 数据汇聚表id
+     */
+    private Integer dataCollectSettingId;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 花费多少秒
+     */
+    private Integer duration;
+
+    /**
+     * 状态
+     * 1运行中 2正常结束 3异常终止
+     */
+    private Integer status;
+
+    /**
+     * 错误信息
+     * 异常终止时记录异常信息
+     */
+    private String error;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+}

dataoperation-server/src/main/java/com/zq/dataoperation/vo/DataCollectReq.java

+package com.zq.dataoperation.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zq.common.vo.PageReqVo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DataCollectReq extends PageReqVo {
+    /**
+     * 数据类型
+     * 1.数据库 2.文件 3.接口 4网站
+     */
+    private Integer dataType;
+
+    /**
+     * 汇聚类型
+     * 1.一次性导入 2.增量导入
+     */
+    private Integer collectType;
+
+    /**
+     * 是否手工导入
+     * 0否 1是
+     */
+    private Boolean isManually;
+
+    /**
+     * 汇聚到的数据表名
+     * 如果是非结构化文件，可以不存入数据表
+     */
+    private String toTable;
+
+    /**
+     * 汇聚任务的名称
+     */
+    private String taskName;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 执行计划的corn表达式
+     * 写执行的corn表达式
+     */
+    private String cron;
+
+    /**
+     * 是否运行的开关
+     * 0否 1是
+     */
+    private Boolean runFlag;
+}