项目初始化

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/async/AsyncTask.java

@@ -41,7 +41,7 @@ public class AsyncTask {
     @Autowired
     private MetadataColumnDao metadataColumnDao;
 
-    @Async
+    @Async("taskExecutor")
     public void doTask(MetadataSourceEntity dataSource) {
         long start = System.currentTimeMillis();
         DbSchema dbSchema = dataSource.getDbSchema();

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/StandardDictDto.java

+package cn.datax.service.data.standard.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 标准信息表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@ApiModel(value = "标准信息表Model")
+@Data
+public class StandardDictDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "所属类别")
+    @NotBlank(message = "所属类别不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String typeId;
+    @ApiModelProperty(value = "标准编码")
+    @NotBlank(message = "标准编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String gbCode;
+    @ApiModelProperty(value = "标准名称")
+    @NotBlank(message = "标准名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String gbName;
+    @ApiModelProperty(value = "状态")
+    @NotNull(message = "状态不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String status;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/StandardTypeDto.java

+package cn.datax.service.data.standard.api.dto;
+
+import cn.datax.common.validate.ValidationGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 标准类别信息表 实体DTO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@ApiModel(value = "标准类别信息表Model")
+@Data
+public class StandardTypeDto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotBlank(message = "主键ID不能为空", groups = {ValidationGroups.Update.class})
+    private String id;
+    @ApiModelProperty(value = "标准类别编码")
+    @NotBlank(message = "标准类别编码不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String gbTypeCode;
+    @ApiModelProperty(value = "标准类别名称")
+    @NotBlank(message = "标准类别名称不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String gbTypeName;
+    @ApiModelProperty(value = "状态")
+    @NotNull(message = "状态不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
+    private String status;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/StandardDictEntity.java

+package cn.datax.service.data.standard.api.entity;
+
+import cn.datax.common.base.DataScopeBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 标准信息表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("standard_dict")
+public class StandardDictEntity extends DataScopeBaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 所属类别
+     */
+    private String typeId;
+
+    /**
+     * 标准编码
+     */
+    private String gbCode;
+
+    /**
+     * 标准名称
+     */
+    private String gbName;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/StandardTypeEntity.java

+package cn.datax.service.data.standard.api.entity;
+
+import cn.datax.common.base.DataScopeBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 标准类别信息表
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("standard_type")
+public class StandardTypeEntity extends DataScopeBaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 标准类别编码
+     */
+    private String gbTypeCode;
+
+    /**
+     * 标准类别名称
+     */
+    private String gbTypeName;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/StandardDictQuery.java

+package cn.datax.service.data.standard.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 标准信息表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StandardDictQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    private String typeId;
+    private String gbCode;
+    private String gbName;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/StandardTypeQuery.java

+package cn.datax.service.data.standard.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 标准类别信息表 查询实体
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StandardTypeQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    private String gbTypeCode;
+    private String gbTypeName;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/StandardDictVo.java

+package cn.datax.service.data.standard.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 标准信息表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+public class StandardDictVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private Integer status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String typeId;
+    private String gbCode;
+    private String gbName;
+}

datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/StandardTypeVo.java

+package cn.datax.service.data.standard.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 标准类别信息表 实体VO
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Data
+public class StandardTypeVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+    private Integer status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+    private String gbTypeCode;
+    private String gbTypeName;
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/InnerController.java

+package cn.datax.service.data.standard.controller;
+
+import cn.datax.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/inner")
+public class InnerController extends BaseController {
+
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/StandardDictController.java

+package cn.datax.service.data.standard.controller;
+
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.data.standard.api.dto.StandardDictDto;
+import cn.datax.service.data.standard.api.entity.StandardDictEntity;
+import cn.datax.service.data.standard.api.vo.StandardDictVo;
+import cn.datax.service.data.standard.api.query.StandardDictQuery;
+import cn.datax.service.data.standard.mapstruct.StandardDictMapper;
+import cn.datax.service.data.standard.service.StandardDictService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 标准信息表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Api(tags = {"标准信息表"})
+@RestController
+@RequestMapping("/standard/standardDict")
+public class StandardDictController extends BaseController {
+
+    @Autowired
+    private StandardDictService standardDictService;
+
+    @Autowired
+    private StandardDictMapper standardDictMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getStandardDictById(@PathVariable String id) {
+        StandardDictEntity standardDictEntity = standardDictService.getStandardDictById(id);
+        return R.ok().setData(standardDictMapper.toVO(standardDictEntity));
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param standardDictQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "standardDictQuery", value = "查询实体standardDictQuery", required = true, dataTypeClass = StandardDictQuery.class)
+    })
+    @GetMapping("/page")
+    public R getStandardDictPage(StandardDictQuery standardDictQuery) {
+        QueryWrapper<StandardDictEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotBlank(standardDictQuery.getGbCode()), "gb_code", standardDictQuery.getGbCode());
+        queryWrapper.like(StrUtil.isNotBlank(standardDictQuery.getGbName()), "gb_name", standardDictQuery.getGbName());
+        queryWrapper.eq(StrUtil.isNotBlank(standardDictQuery.getTypeId()), "type_id", standardDictQuery.getTypeId());
+        IPage<StandardDictEntity> page = standardDictService.page(new Page<>(standardDictQuery.getPageNum(), standardDictQuery.getPageSize()), queryWrapper);
+        List<StandardDictVo> collect = page.getRecords().stream().map(standardDictMapper::toVO).collect(Collectors.toList());
+        JsonPage<StandardDictVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param standardDict
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据standardDict对象添加信息")
+    @ApiImplicitParam(name = "standardDict", value = "详细实体standardDict", required = true, dataType = "StandardDictDto")
+    @PostMapping()
+    public R saveStandardDict(@RequestBody @Validated({ValidationGroups.Insert.class}) StandardDictDto standardDict) {
+        StandardDictEntity standardDictEntity = standardDictService.saveStandardDict(standardDict);
+        return R.ok().setData(standardDictMapper.toVO(standardDictEntity));
+    }
+
+    /**
+     * 修改
+     * @param standardDict
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "standardDict", value = "详细实体standardDict", required = true, dataType = "StandardDictDto")
+    })
+    @PutMapping("/{id}")
+    public R updateStandardDict(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) StandardDictDto standardDict) {
+        StandardDictEntity standardDictEntity = standardDictService.updateStandardDict(standardDict);
+        return R.ok().setData(standardDictMapper.toVO(standardDictEntity));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteStandardDictById(@PathVariable String id) {
+        standardDictService.deleteStandardDictById(id);
+        return R.ok();
+    }
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "批量删除角色", notes = "根据url的ids来批量删除对象")
+    @ApiImplicitParam(name = "ids", value = "ID集合", required = true, dataType = "List", paramType = "path")
+    @DeleteMapping("/batch/{ids}")
+    public R deleteStandardDictBatch(@PathVariable List<String> ids) {
+        standardDictService.deleteStandardDictBatch(ids);
+        return R.ok();
+    }
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/StandardTypeController.java

+package cn.datax.service.data.standard.controller;
+
+import cn.datax.common.core.DataConstant;
+import cn.datax.common.core.JsonPage;
+import cn.datax.common.core.R;
+import cn.datax.common.validate.ValidationGroups;
+import cn.datax.service.data.standard.api.dto.StandardTypeDto;
+import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
+import cn.datax.service.data.standard.api.vo.StandardTypeVo;
+import cn.datax.service.data.standard.api.query.StandardTypeQuery;
+import cn.datax.service.data.standard.mapstruct.StandardTypeMapper;
+import cn.datax.service.data.standard.service.StandardTypeService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import cn.datax.common.base.BaseController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 标准类别信息表 前端控制器
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Api(tags = {"标准类别信息表"})
+@RestController
+@RequestMapping("/standard/standardType")
+public class StandardTypeController extends BaseController {
+
+    @Autowired
+    private StandardTypeService standardTypeService;
+
+    @Autowired
+    private StandardTypeMapper standardTypeMapper;
+
+    /**
+     * 通过ID查询信息
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/{id}")
+    public R getStandardTypeById(@PathVariable String id) {
+        StandardTypeEntity standardTypeEntity = standardTypeService.getStandardTypeById(id);
+        return R.ok().setData(standardTypeMapper.toVO(standardTypeEntity));
+    }
+
+    @ApiOperation(value = "获取列表", notes = "")
+    @GetMapping("/list")
+    public R getMetadataSourceList() {
+        QueryWrapper<StandardTypeEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", DataConstant.EnableState.ENABLE.getKey());
+        List<StandardTypeEntity> list = standardTypeService.list(queryWrapper);
+        List<StandardTypeVo> collect = list.stream().map(standardTypeMapper::toVO).collect(Collectors.toList());
+        return R.ok().setData(collect);
+    }
+
+    /**
+     * 分页查询信息
+     *
+     * @param standardTypeQuery
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "standardTypeQuery", value = "查询实体standardTypeQuery", required = true, dataTypeClass = StandardTypeQuery.class)
+    })
+    @GetMapping("/page")
+    public R getStandardTypePage(StandardTypeQuery standardTypeQuery) {
+        QueryWrapper<StandardTypeEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StrUtil.isNotBlank(standardTypeQuery.getGbTypeCode()), "gb_type_code", standardTypeQuery.getGbTypeCode());
+        queryWrapper.like(StrUtil.isNotBlank(standardTypeQuery.getGbTypeName()), "gb_type_name", standardTypeQuery.getGbTypeName());
+        IPage<StandardTypeEntity> page = standardTypeService.page(new Page<>(standardTypeQuery.getPageNum(), standardTypeQuery.getPageSize()), queryWrapper);
+        List<StandardTypeVo> collect = page.getRecords().stream().map(standardTypeMapper::toVO).collect(Collectors.toList());
+        JsonPage<StandardTypeVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
+    }
+
+    /**
+     * 添加
+     * @param standardType
+     * @return
+     */
+    @ApiOperation(value = "添加信息", notes = "根据standardType对象添加信息")
+    @ApiImplicitParam(name = "standardType", value = "详细实体standardType", required = true, dataType = "StandardTypeDto")
+    @PostMapping()
+    public R saveStandardType(@RequestBody @Validated({ValidationGroups.Insert.class}) StandardTypeDto standardType) {
+        StandardTypeEntity standardTypeEntity = standardTypeService.saveStandardType(standardType);
+        return R.ok().setData(standardTypeMapper.toVO(standardTypeEntity));
+    }
+
+    /**
+     * 修改
+     * @param standardType
+     * @return
+     */
+    @ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "standardType", value = "详细实体standardType", required = true, dataType = "StandardTypeDto")
+    })
+    @PutMapping("/{id}")
+    public R updateStandardType(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) StandardTypeDto standardType) {
+        StandardTypeEntity standardTypeEntity = standardTypeService.updateStandardType(standardType);
+        return R.ok().setData(standardTypeMapper.toVO(standardTypeEntity));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping("/{id}")
+    public R deleteStandardTypeById(@PathVariable String id) {
+        standardTypeService.deleteStandardTypeById(id);
+        return R.ok();
+    }
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "批量删除角色", notes = "根据url的ids来批量删除对象")
+    @ApiImplicitParam(name = "ids", value = "ID集合", required = true, dataType = "List", paramType = "path")
+    @DeleteMapping("/batch/{ids}")
+    public R deleteStandardTypeBatch(@PathVariable List<String> ids) {
+        standardTypeService.deleteStandardTypeBatch(ids);
+        return R.ok();
+    }
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/StandardDictDao.java

+package cn.datax.service.data.standard.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.data.standard.api.entity.StandardDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 标准信息表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Mapper
+public interface StandardDictDao extends BaseDao<StandardDictEntity> {
+
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/StandardTypeDao.java

+package cn.datax.service.data.standard.dao;
+
+import cn.datax.common.base.BaseDao;
+import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 标准类别信息表 Mapper 接口
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Mapper
+public interface StandardTypeDao extends BaseDao<StandardTypeEntity> {
+
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/StandardDictMapper.java

+package cn.datax.service.data.standard.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.data.standard.api.dto.StandardDictDto;
+import cn.datax.service.data.standard.api.entity.StandardDictEntity;
+import cn.datax.service.data.standard.api.vo.StandardDictVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 标准信息表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Mapper(componentModel = "spring")
+public interface StandardDictMapper extends EntityMapper<StandardDictDto, StandardDictEntity, StandardDictVo> {
+
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/StandardTypeMapper.java

+package cn.datax.service.data.standard.mapstruct;
+
+import cn.datax.common.mapstruct.EntityMapper;
+import cn.datax.service.data.standard.api.dto.StandardTypeDto;
+import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
+import cn.datax.service.data.standard.api.vo.StandardTypeVo;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 标准类别信息表 Mapper 实体映射
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Mapper(componentModel = "spring")
+public interface StandardTypeMapper extends EntityMapper<StandardTypeDto, StandardTypeEntity, StandardTypeVo> {
+
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/StandardDictService.java

+package cn.datax.service.data.standard.service;
+
+import cn.datax.service.data.standard.api.entity.StandardDictEntity;
+import cn.datax.service.data.standard.api.dto.StandardDictDto;
+import cn.datax.common.base.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准信息表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+public interface StandardDictService extends BaseService<StandardDictEntity> {
+
+    StandardDictEntity saveStandardDict(StandardDictDto standardDict);
+
+    StandardDictEntity updateStandardDict(StandardDictDto standardDict);
+
+    StandardDictEntity getStandardDictById(String id);
+
+    void deleteStandardDictById(String id);
+
+    void deleteStandardDictBatch(List<String> ids);
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/StandardTypeService.java

+package cn.datax.service.data.standard.service;
+
+import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
+import cn.datax.service.data.standard.api.dto.StandardTypeDto;
+import cn.datax.common.base.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准类别信息表 服务类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+public interface StandardTypeService extends BaseService<StandardTypeEntity> {
+
+    StandardTypeEntity saveStandardType(StandardTypeDto standardType);
+
+    StandardTypeEntity updateStandardType(StandardTypeDto standardType);
+
+    StandardTypeEntity getStandardTypeById(String id);
+
+    void deleteStandardTypeById(String id);
+
+    void deleteStandardTypeBatch(List<String> ids);
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/StandardDictServiceImpl.java

+package cn.datax.service.data.standard.service.impl;
+
+import cn.datax.service.data.standard.api.entity.StandardDictEntity;
+import cn.datax.service.data.standard.api.dto.StandardDictDto;
+import cn.datax.service.data.standard.service.StandardDictService;
+import cn.datax.service.data.standard.mapstruct.StandardDictMapper;
+import cn.datax.service.data.standard.dao.StandardDictDao;
+import cn.datax.common.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准信息表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class StandardDictServiceImpl extends BaseServiceImpl<StandardDictDao, StandardDictEntity> implements StandardDictService {
+
+    @Autowired
+    private StandardDictDao standardDictDao;
+
+    @Autowired
+    private StandardDictMapper standardDictMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StandardDictEntity saveStandardDict(StandardDictDto standardDictDto) {
+        StandardDictEntity standardDict = standardDictMapper.toEntity(standardDictDto);
+        standardDictDao.insert(standardDict);
+        return standardDict;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StandardDictEntity updateStandardDict(StandardDictDto standardDictDto) {
+        StandardDictEntity standardDict = standardDictMapper.toEntity(standardDictDto);
+        standardDictDao.updateById(standardDict);
+        return standardDict;
+    }
+
+    @Override
+    public StandardDictEntity getStandardDictById(String id) {
+        StandardDictEntity standardDictEntity = super.getById(id);
+        return standardDictEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStandardDictById(String id) {
+        standardDictDao.deleteById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStandardDictBatch(List<String> ids) {
+        standardDictDao.deleteBatchIds(ids);
+    }
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/StandardTypeServiceImpl.java

+package cn.datax.service.data.standard.service.impl;
+
+import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
+import cn.datax.service.data.standard.api.dto.StandardTypeDto;
+import cn.datax.service.data.standard.service.StandardTypeService;
+import cn.datax.service.data.standard.mapstruct.StandardTypeMapper;
+import cn.datax.service.data.standard.dao.StandardTypeDao;
+import cn.datax.common.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准类别信息表 服务实现类
+ * </p>
+ *
+ * @author yuwei
+ * @since 2020-08-10
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class StandardTypeServiceImpl extends BaseServiceImpl<StandardTypeDao, StandardTypeEntity> implements StandardTypeService {
+
+    @Autowired
+    private StandardTypeDao standardTypeDao;
+
+    @Autowired
+    private StandardTypeMapper standardTypeMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StandardTypeEntity saveStandardType(StandardTypeDto standardTypeDto) {
+        StandardTypeEntity standardType = standardTypeMapper.toEntity(standardTypeDto);
+        standardTypeDao.insert(standardType);
+        return standardType;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StandardTypeEntity updateStandardType(StandardTypeDto standardTypeDto) {
+        StandardTypeEntity standardType = standardTypeMapper.toEntity(standardTypeDto);
+        standardTypeDao.updateById(standardType);
+        return standardType;
+    }
+
+    @Override
+    public StandardTypeEntity getStandardTypeById(String id) {
+        StandardTypeEntity standardTypeEntity = super.getById(id);
+        return standardTypeEntity;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStandardTypeById(String id) {
+        standardTypeDao.deleteById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteStandardTypeBatch(List<String> ids) {
+        standardTypeDao.deleteBatchIds(ids);
+    }
+}

datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/StandardDictMapper.xml

+<?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="cn.datax.service.data.standard.dao.StandardDictDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.StandardDictEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="create_dept" property="createDept" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="type_id" property="typeId" />
+        <result column="gb_code" property="gbCode" />
+        <result column="gb_name" property="gbName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
+        remark,
+        type_id, gb_code, gb_name
+    </sql>
+
+</mapper>

datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/StandardTypeMapper.xml

+<?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="cn.datax.service.data.standard.dao.StandardTypeDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.StandardTypeEntity">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="create_dept" property="createDept" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="gb_type_code" property="gbTypeCode" />
+        <result column="gb_type_name" property="gbTypeName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
+        remark,
+        gb_type_code, gb_type_name
+    </sql>
+
+</mapper>

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/async/AsyncTask.java

@@ -17,7 +17,7 @@ public class AsyncTask {
     @Autowired
     private LogService logService;
 
-    @Async
+    @Async("taskExecutor")
     public void doTask(LogDto logDto) {
         logService.saveLog(logDto);
     }