Skip to content

D
datax-cloud
Commit e6d07bdc by yuwei
Options

项目初始化

parent 3283751a
Showing with 335 additions and 294 deletions
datax-common/datax-common-core/src/main/java/cn/datax/common/validate/ValidationGroups.java
......@@ -6,5 +6,7 @@ public class ValidationGroups {
public interface Update{};
public interface Status{};
public interface Other{};
}
datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java
......@@ -2,6 +2,7 @@ package cn.datax.service.codegen.utils;
import cn.datax.service.codegen.engine.VelocityTemplateEngine;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig;
......@@ -17,9 +18,11 @@ import java.util.Map;
public class Generate {
// public static void main(String[] args) {
// generateByTables("F://code", "market", "cn.datax.service.data", new String[]{"data_api"});
// }
public static void main(String[] args) {
// DefaultIdentifierGenerator generator = new DefaultIdentifierGenerator();
// System.out.println(generator.nextId(null));
generateByTables("F://code", "standard", "cn.datax.service.data", "standard_", new String[]{"standard_dict", "standard_type"});
}
/**
* 根据表自动生成
......@@ -28,7 +31,7 @@ public class Generate {
* @param parentName 包名
* @param tableNames 表名
*/
private static void generateByTables(String projectPath,String moduleName, String parentName, String[] tableNames) {
private static void generateByTables(String projectPath,String moduleName, String parentName, String tablePrefix, String[] tableNames) {
//配置数据源
DataSourceConfig dataSourceConfig = getDataSourceConfig();
//全局变量配置
......@@ -36,7 +39,7 @@ public class Generate {
//包名配置
PackageConfig packageConfig = getPackageConfig(moduleName, parentName);
// 策略配置
StrategyConfig strategyConfig = getStrategyConfig(tableNames);
StrategyConfig strategyConfig = getStrategyConfig(tablePrefix, tableNames);
//自定义配置
InjectionConfig injectionConfig = getInjectionConfig(projectPath, moduleName, parentName);
//配置模板
......@@ -195,7 +198,7 @@ public class Generate {
* @param tableNames 表名
* @return StrategyConfig
*/
private static StrategyConfig getStrategyConfig(String[] tableNames) {
private static StrategyConfig getStrategyConfig(String tablePrefix, String[] tableNames) {
StrategyConfig strategyConfig = new StrategyConfig()
//从数据库表到文件的命名策略
.setNaming(NamingStrategy.underline_to_camel)
......@@ -204,7 +207,7 @@ public class Generate {
.setRestControllerStyle(true)
.setControllerMappingHyphenStyle(true)
//表前缀
.setTablePrefix("sys_")
.setTablePrefix(tablePrefix)
//写于父类中的公共字段
.setSuperEntityColumns(new String[]{"id", "create_time", "create_by", "create_dept", "update_time", "update_by", "status", "remark"})
.setInclude(tableNames)
......@@ -224,7 +227,7 @@ public class Generate {
*/
private static DataSourceConfig getDataSourceConfig() {
return new DataSourceConfig()
.setUrl("jdbc:mysql://192.168.234.100:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8")
.setUrl("jdbc:mysql://localhost:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8")
.setDriverName("com.mysql.cj.jdbc.Driver")
.setUsername("root")
.setPassword("1234@abcd");
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/StandardDictDto.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/DictDto.java
......@@ -6,20 +6,18 @@ 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
* @since 2020-08-26
*/
@ApiModel(value = "标准信息表Model")
@Data
public class StandardDictDto implements Serializable {
public class DictDto implements Serializable {
private static final long serialVersionUID=1L;
......@@ -35,9 +33,4 @@ public class StandardDictDto implements Serializable {
@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 → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/TypeDto.java
......@@ -6,20 +6,18 @@ 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
* @since 2020-08-26
*/
@ApiModel(value = "标准类别信息表Model")
@Data
public class StandardTypeDto implements Serializable {
public class TypeDto implements Serializable {
private static final long serialVersionUID=1L;
......@@ -32,9 +30,4 @@ public class StandardTypeDto implements Serializable {
@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 → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/DictEntity.java
package cn.datax.service.data.standard.api.entity;
import cn.datax.common.base.DataScopeBaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -12,13 +13,13 @@ import lombok.experimental.Accessors;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("standard_dict")
public class StandardDictEntity extends DataScopeBaseEntity {
public class DictEntity extends DataScopeBaseEntity {
private static final long serialVersionUID=1L;
......@@ -28,6 +29,18 @@ public class StandardDictEntity extends DataScopeBaseEntity {
private String typeId;
/**
* 标准类别编码
*/
@TableField(exist = false)
private String gbTypeCode;
/**
* 标准类别名称
*/
@TableField(exist = false)
private String gbTypeName;
/**
* 标准编码
*/
private String gbCode;
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/StandardTypeEntity.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/entity/TypeEntity.java
......@@ -2,6 +2,7 @@ package cn.datax.service.data.standard.api.entity;
import cn.datax.common.base.DataScopeBaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import cn.datax.common.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -12,13 +13,13 @@ import lombok.experimental.Accessors;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("standard_type")
public class StandardTypeEntity extends DataScopeBaseEntity {
public class TypeEntity extends DataScopeBaseEntity {
private static final long serialVersionUID=1L;
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/StandardDictQuery.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/DictQuery.java
......@@ -10,11 +10,11 @@ import lombok.EqualsAndHashCode;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class StandardDictQuery extends BaseQueryParams {
public class DictQuery extends BaseQueryParams {
private static final long serialVersionUID=1L;
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/StandardTypeQuery.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/query/TypeQuery.java
......@@ -10,11 +10,11 @@ import lombok.EqualsAndHashCode;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class StandardTypeQuery extends BaseQueryParams {
public class TypeQuery extends BaseQueryParams {
private static final long serialVersionUID=1L;
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/StandardDictVo.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/DictVo.java
......@@ -12,15 +12,15 @@ import java.time.LocalDateTime;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
public class StandardDictVo implements Serializable {
public class DictVo implements Serializable {
private static final long serialVersionUID=1L;
private String id;
private Integer status;
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
private String typeId;
......
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/StandardTypeVo.java → datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/vo/TypeVo.java
......@@ -12,17 +12,18 @@ import java.time.LocalDateTime;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Data
public class StandardTypeVo implements Serializable {
public class TypeVo implements Serializable {
private static final long serialVersionUID=1L;
private String id;
private Integer status;
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
private String createDept;
private String gbTypeCode;
private String gbTypeName;
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/StandardDictController.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/DictController.java
......@@ -3,12 +3,12 @@ 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.datax.service.data.standard.api.dto.DictDto;
import cn.datax.service.data.standard.api.entity.DictEntity;
import cn.datax.service.data.standard.api.vo.DictVo;
import cn.datax.service.data.standard.api.query.DictQuery;
import cn.datax.service.data.standard.mapstruct.DictMapper;
import cn.datax.service.data.standard.service.DictService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -32,18 +32,18 @@ import java.util.stream.Collectors;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Api(tags = {"标准信息表"})
@RestController
@RequestMapping("/standard/standardDict")
public class StandardDictController extends BaseController {
@RequestMapping("/dicts")
public class DictController extends BaseController {
@Autowired
private StandardDictService standardDictService;
private DictService dictService;
@Autowired
private StandardDictMapper standardDictMapper;
private DictMapper dictMapper;
/**
* 通过ID查询信息
......@@ -54,60 +54,60 @@ public class StandardDictController extends BaseController {
@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));
public R getDictById(@PathVariable String id) {
DictEntity dictEntity = dictService.getDictById(id);
return R.ok().setData(dictMapper.toVO(dictEntity));
}
/**
* 分页查询信息
*
* @param standardDictQuery
* @param dictQuery
* @return
*/
@ApiOperation(value = "分页查询", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "standardDictQuery", value = "查询实体standardDictQuery", required = true, dataTypeClass = StandardDictQuery.class)
@ApiImplicitParam(name = "dictQuery", value = "查询实体dictQuery", required = true, dataTypeClass = DictQuery.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);
public R getDictPage(DictQuery dictQuery) {
QueryWrapper<DictEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StrUtil.isNotBlank(dictQuery.getTypeId()), "d.type_id", dictQuery.getTypeId());
queryWrapper.like(StrUtil.isNotBlank(dictQuery.getGbCode()), "d.gb_code", dictQuery.getGbCode());
queryWrapper.like(StrUtil.isNotBlank(dictQuery.getGbName()), "d.gb_name", dictQuery.getGbName());
IPage<DictEntity> page = dictService.page(new Page<>(dictQuery.getPageNum(), dictQuery.getPageSize()), queryWrapper);
List<DictVo> collect = page.getRecords().stream().map(dictMapper::toVO).collect(Collectors.toList());
JsonPage<DictVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
return R.ok().setData(jsonPage);
}
/**
* 添加
* @param standardDict
* @param dict
* @return
*/
@ApiOperation(value = "添加信息", notes = "根据standardDict对象添加信息")
@ApiImplicitParam(name = "standardDict", value = "详细实体standardDict", required = true, dataType = "StandardDictDto")
@ApiOperation(value = "添加信息", notes = "根据dict对象添加信息")
@ApiImplicitParam(name = "dict", value = "详细实体dict", required = true, dataType = "DictDto")
@PostMapping()
public R saveStandardDict(@RequestBody @Validated({ValidationGroups.Insert.class}) StandardDictDto standardDict) {
StandardDictEntity standardDictEntity = standardDictService.saveStandardDict(standardDict);
return R.ok().setData(standardDictMapper.toVO(standardDictEntity));
public R saveDict(@RequestBody @Validated({ValidationGroups.Insert.class}) DictDto dict) {
DictEntity dictEntity = dictService.saveDict(dict);
return R.ok().setData(dictMapper.toVO(dictEntity));
}
/**
* 修改
* @param standardDict
* @param dict
* @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")
@ApiImplicitParam(name = "dict", value = "详细实体dict", required = true, dataType = "DictDto")
})
@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));
public R updateDict(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) DictDto dict) {
DictEntity dictEntity = dictService.updateDict(dict);
return R.ok().setData(dictMapper.toVO(dictEntity));
}
/**
......@@ -118,8 +118,8 @@ public class StandardDictController extends BaseController {
@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);
public R deleteDictById(@PathVariable String id) {
dictService.deleteDictById(id);
return R.ok();
}
......@@ -131,8 +131,8 @@ public class StandardDictController extends BaseController {
@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);
public R deleteDictBatch(@PathVariable List<String> ids) {
dictService.deleteDictBatch(ids);
return R.ok();
}
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/StandardTypeController.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/controller/TypeController.java
......@@ -4,12 +4,12 @@ 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.datax.service.data.standard.api.dto.TypeDto;
import cn.datax.service.data.standard.api.entity.TypeEntity;
import cn.datax.service.data.standard.api.vo.TypeVo;
import cn.datax.service.data.standard.api.query.TypeQuery;
import cn.datax.service.data.standard.mapstruct.TypeMapper;
import cn.datax.service.data.standard.service.TypeService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -33,18 +33,18 @@ import java.util.stream.Collectors;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Api(tags = {"标准类别信息表"})
@RestController
@RequestMapping("/standard/standardType")
public class StandardTypeController extends BaseController {
@RequestMapping("/types")
public class TypeController extends BaseController {
@Autowired
private StandardTypeService standardTypeService;
private TypeService typeService;
@Autowired
private StandardTypeMapper standardTypeMapper;
private TypeMapper typeMapper;
/**
* 通过ID查询信息
......@@ -55,69 +55,69 @@ public class StandardTypeController extends BaseController {
@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));
public R getTypeById(@PathVariable String id) {
TypeEntity typeEntity = typeService.getTypeById(id);
return R.ok().setData(typeMapper.toVO(typeEntity));
}
@ApiOperation(value = "获取列表", notes = "")
@GetMapping("/list")
public R getMetadataSourceList() {
QueryWrapper<StandardTypeEntity> queryWrapper = new QueryWrapper<>();
public R getTypeList() {
QueryWrapper<TypeEntity> 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());
List<TypeEntity> list = typeService.list(queryWrapper);
List<TypeVo> collect = list.stream().map(typeMapper::toVO).collect(Collectors.toList());
return R.ok().setData(collect);
}
/**
* 分页查询信息
*
* @param standardTypeQuery
* @param typeQuery
* @return
*/
@ApiOperation(value = "分页查询", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "standardTypeQuery", value = "查询实体standardTypeQuery", required = true, dataTypeClass = StandardTypeQuery.class)
@ApiImplicitParam(name = "typeQuery", value = "查询实体typeQuery", required = true, dataTypeClass = TypeQuery.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);
public R getTypePage(TypeQuery typeQuery) {
QueryWrapper<TypeEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(typeQuery.getGbTypeCode()), "gb_type_code", typeQuery.getGbTypeCode());
queryWrapper.like(StrUtil.isNotBlank(typeQuery.getGbTypeName()), "gb_type_name", typeQuery.getGbTypeName());
IPage<TypeEntity> page = typeService.page(new Page<>(typeQuery.getPageNum(), typeQuery.getPageSize()), queryWrapper);
List<TypeVo> collect = page.getRecords().stream().map(typeMapper::toVO).collect(Collectors.toList());
JsonPage<TypeVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
return R.ok().setData(jsonPage);
}
/**
* 添加
* @param standardType
* @param type
* @return
*/
@ApiOperation(value = "添加信息", notes = "根据standardType对象添加信息")
@ApiImplicitParam(name = "standardType", value = "详细实体standardType", required = true, dataType = "StandardTypeDto")
@ApiOperation(value = "添加信息", notes = "根据type对象添加信息")
@ApiImplicitParam(name = "type", value = "详细实体type", required = true, dataType = "TypeDto")
@PostMapping()
public R saveStandardType(@RequestBody @Validated({ValidationGroups.Insert.class}) StandardTypeDto standardType) {
StandardTypeEntity standardTypeEntity = standardTypeService.saveStandardType(standardType);
return R.ok().setData(standardTypeMapper.toVO(standardTypeEntity));
public R saveType(@RequestBody @Validated({ValidationGroups.Insert.class}) TypeDto type) {
TypeEntity typeEntity = typeService.saveType(type);
return R.ok().setData(typeMapper.toVO(typeEntity));
}
/**
* 修改
* @param standardType
* @param type
* @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")
@ApiImplicitParam(name = "type", value = "详细实体type", required = true, dataType = "TypeDto")
})
@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));
public R updateType(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) TypeDto type) {
TypeEntity typeEntity = typeService.updateType(type);
return R.ok().setData(typeMapper.toVO(typeEntity));
}
/**
......@@ -128,8 +128,8 @@ public class StandardTypeController extends BaseController {
@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);
public R deleteTypeById(@PathVariable String id) {
typeService.deleteTypeById(id);
return R.ok();
}
......@@ -141,8 +141,8 @@ public class StandardTypeController extends BaseController {
@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);
public R deleteTypeBatch(@PathVariable List<String> ids) {
typeService.deleteTypeBatch(ids);
return R.ok();
}
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/StandardDictDao.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/DictDao.java
package cn.datax.service.data.standard.dao;
import cn.datax.common.base.BaseDao;
import cn.datax.service.data.standard.api.entity.StandardDictEntity;
import cn.datax.service.data.standard.api.entity.DictEntity;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* <p>
......@@ -10,9 +16,14 @@ import org.apache.ibatis.annotations.Mapper;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Mapper
public interface StandardDictDao extends BaseDao<StandardDictEntity> {
public interface DictDao extends BaseDao<DictEntity> {
@Override
DictEntity selectById(Serializable id);
@Override
<E extends IPage<DictEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<DictEntity> queryWrapper);
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/StandardTypeDao.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/dao/TypeDao.java
package cn.datax.service.data.standard.dao;
import cn.datax.common.base.BaseDao;
import cn.datax.service.data.standard.api.entity.StandardTypeEntity;
import cn.datax.service.data.standard.api.entity.TypeEntity;
import org.apache.ibatis.annotations.Mapper;
/**
......@@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Mapper;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Mapper
public interface StandardTypeDao extends BaseDao<StandardTypeEntity> {
public interface TypeDao extends BaseDao<TypeEntity> {
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/StandardDictMapper.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/DictMapper.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 cn.datax.service.data.standard.api.dto.DictDto;
import cn.datax.service.data.standard.api.entity.DictEntity;
import cn.datax.service.data.standard.api.vo.DictVo;
import org.mapstruct.Mapper;
/**
......@@ -12,9 +12,9 @@ import org.mapstruct.Mapper;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Mapper(componentModel = "spring")
public interface StandardDictMapper extends EntityMapper<StandardDictDto, StandardDictEntity, StandardDictVo> {
public interface DictMapper extends EntityMapper<DictDto, DictEntity, DictVo> {
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/StandardTypeMapper.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/mapstruct/TypeMapper.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 cn.datax.service.data.standard.api.dto.TypeDto;
import cn.datax.service.data.standard.api.entity.TypeEntity;
import cn.datax.service.data.standard.api.vo.TypeVo;
import org.mapstruct.Mapper;
/**
......@@ -12,9 +12,9 @@ import org.mapstruct.Mapper;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Mapper(componentModel = "spring")
public interface StandardTypeMapper extends EntityMapper<StandardTypeDto, StandardTypeEntity, StandardTypeVo> {
public interface TypeMapper extends EntityMapper<TypeDto, TypeEntity, TypeVo> {
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/StandardDictService.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/DictService.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.service.data.standard.api.entity.DictEntity;
import cn.datax.service.data.standard.api.dto.DictDto;
import cn.datax.common.base.BaseService;
import java.util.List;
......@@ -12,17 +12,17 @@ import java.util.List;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
public interface StandardDictService extends BaseService<StandardDictEntity> {
public interface DictService extends BaseService<DictEntity> {
StandardDictEntity saveStandardDict(StandardDictDto standardDict);
DictEntity saveDict(DictDto dict);
StandardDictEntity updateStandardDict(StandardDictDto standardDict);
DictEntity updateDict(DictDto dict);
StandardDictEntity getStandardDictById(String id);
DictEntity getDictById(String id);
void deleteStandardDictById(String id);
void deleteDictById(String id);
void deleteStandardDictBatch(List<String> ids);
void deleteDictBatch(List<String> ids);
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/StandardTypeService.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/TypeService.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.service.data.standard.api.entity.TypeEntity;
import cn.datax.service.data.standard.api.dto.TypeDto;
import cn.datax.common.base.BaseService;
import java.util.List;
......@@ -12,17 +12,17 @@ import java.util.List;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
public interface StandardTypeService extends BaseService<StandardTypeEntity> {
public interface TypeService extends BaseService<TypeEntity> {
StandardTypeEntity saveStandardType(StandardTypeDto standardType);
TypeEntity saveType(TypeDto type);
StandardTypeEntity updateStandardType(StandardTypeDto standardType);
TypeEntity updateType(TypeDto type);
StandardTypeEntity getStandardTypeById(String id);
TypeEntity getTypeById(String id);
void deleteStandardTypeById(String id);
void deleteTypeById(String id);
void deleteStandardTypeBatch(List<String> ids);
void deleteTypeBatch(List<String> ids);
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/StandardDictServiceImpl.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/DictServiceImpl.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.service.data.standard.api.entity.DictEntity;
import cn.datax.service.data.standard.api.dto.DictDto;
import cn.datax.service.data.standard.service.DictService;
import cn.datax.service.data.standard.mapstruct.DictMapper;
import cn.datax.service.data.standard.dao.DictDao;
import cn.datax.common.base.BaseServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,49 +19,49 @@ import java.util.List;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class StandardDictServiceImpl extends BaseServiceImpl<StandardDictDao, StandardDictEntity> implements StandardDictService {
public class DictServiceImpl extends BaseServiceImpl<DictDao, DictEntity> implements DictService {
@Autowired
private StandardDictDao standardDictDao;
private DictDao dictDao;
@Autowired
private StandardDictMapper standardDictMapper;
private DictMapper dictMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public StandardDictEntity saveStandardDict(StandardDictDto standardDictDto) {
StandardDictEntity standardDict = standardDictMapper.toEntity(standardDictDto);
standardDictDao.insert(standardDict);
return standardDict;
public DictEntity saveDict(DictDto dictDto) {
DictEntity dict = dictMapper.toEntity(dictDto);
dictDao.insert(dict);
return dict;
}
@Override
@Transactional(rollbackFor = Exception.class)
public StandardDictEntity updateStandardDict(StandardDictDto standardDictDto) {
StandardDictEntity standardDict = standardDictMapper.toEntity(standardDictDto);
standardDictDao.updateById(standardDict);
return standardDict;
public DictEntity updateDict(DictDto dictDto) {
DictEntity dict = dictMapper.toEntity(dictDto);
dictDao.updateById(dict);
return dict;
}
@Override
public StandardDictEntity getStandardDictById(String id) {
StandardDictEntity standardDictEntity = super.getById(id);
return standardDictEntity;
public DictEntity getDictById(String id) {
DictEntity dictEntity = super.getById(id);
return dictEntity;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteStandardDictById(String id) {
standardDictDao.deleteById(id);
public void deleteDictById(String id) {
dictDao.deleteById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteStandardDictBatch(List<String> ids) {
standardDictDao.deleteBatchIds(ids);
public void deleteDictBatch(List<String> ids) {
dictDao.deleteBatchIds(ids);
}
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/StandardTypeServiceImpl.java → datax-modules/data-standard-service-parent/data-standard-service/src/main/java/cn/datax/service/data/standard/service/impl/TypeServiceImpl.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.service.data.standard.api.entity.TypeEntity;
import cn.datax.service.data.standard.api.dto.TypeDto;
import cn.datax.service.data.standard.service.TypeService;
import cn.datax.service.data.standard.mapstruct.TypeMapper;
import cn.datax.service.data.standard.dao.TypeDao;
import cn.datax.common.base.BaseServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,49 +19,49 @@ import java.util.List;
* </p>
*
* @author yuwei
* @since 2020-08-10
* @since 2020-08-26
*/
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class StandardTypeServiceImpl extends BaseServiceImpl<StandardTypeDao, StandardTypeEntity> implements StandardTypeService {
public class TypeServiceImpl extends BaseServiceImpl<TypeDao, TypeEntity> implements TypeService {
@Autowired
private StandardTypeDao standardTypeDao;
private TypeDao typeDao;
@Autowired
private StandardTypeMapper standardTypeMapper;
private TypeMapper typeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public StandardTypeEntity saveStandardType(StandardTypeDto standardTypeDto) {
StandardTypeEntity standardType = standardTypeMapper.toEntity(standardTypeDto);
standardTypeDao.insert(standardType);
return standardType;
public TypeEntity saveType(TypeDto typeDto) {
TypeEntity type = typeMapper.toEntity(typeDto);
typeDao.insert(type);
return type;
}
@Override
@Transactional(rollbackFor = Exception.class)
public StandardTypeEntity updateStandardType(StandardTypeDto standardTypeDto) {
StandardTypeEntity standardType = standardTypeMapper.toEntity(standardTypeDto);
standardTypeDao.updateById(standardType);
return standardType;
public TypeEntity updateType(TypeDto typeDto) {
TypeEntity type = typeMapper.toEntity(typeDto);
typeDao.updateById(type);
return type;
}
@Override
public StandardTypeEntity getStandardTypeById(String id) {
StandardTypeEntity standardTypeEntity = super.getById(id);
return standardTypeEntity;
public TypeEntity getTypeById(String id) {
TypeEntity typeEntity = super.getById(id);
return typeEntity;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteStandardTypeById(String id) {
standardTypeDao.deleteById(id);
public void deleteTypeById(String id) {
typeDao.deleteById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteStandardTypeBatch(List<String> ids) {
standardTypeDao.deleteBatchIds(ids);
public void deleteTypeBatch(List<String> ids) {
typeDao.deleteBatchIds(ids);
}
}
datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/StandardDictMapper.xml → datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/DictMapper.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">
<mapper namespace="cn.datax.service.data.standard.dao.DictDao">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.StandardDictEntity">
<resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.DictEntity">
<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="create_dept" property="createDept" />
<result column="type_id" property="typeId" />
<result column="gb_code" property="gbCode" />
<result column="gb_name" property="gbName" />
<result column="gb_type_code" property="gbTypeCode" />
<result column="gb_type_name" property="gbTypeName" />
</resultMap>
<!-- 通用查询结果列 -->
......@@ -26,8 +28,34 @@
create_dept,
update_by,
update_time,
remark,
type_id, gb_code, gb_name
remark, type_id, gb_code, gb_name
</sql>
<sql id="Dict_Column_List">
${alias}.id,
${alias}.status,
${alias}.create_by,
${alias}.create_time,
${alias}.create_dept,
${alias}.update_by,
${alias}.update_time,
${alias}.remark, ${alias}.type_id, ${alias}.gb_code, ${alias}.gb_name
</sql>
<select id="selectById" resultMap="BaseResultMap">
SELECT t.gb_type_code, t.gb_type_name,
<include refid="Dict_Column_List"><property name="alias" value="d"/></include>
FROM standard_dict d
LEFT JOIN standard_type t ON t.id = d.type_id
WHERE 1 = 1 AND d.id = #{id}
</select>
<select id="selectPage" resultMap="BaseResultMap">
SELECT t.gb_type_code, t.gb_type_name,
<include refid="Dict_Column_List"><property name="alias" value="d"/></include>
FROM standard_dict d
LEFT JOIN standard_type t ON t.id = d.type_id
${ew.customSqlSegment}
</select>
</mapper>
datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/StandardTypeMapper.xml → datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/mapper/TypeMapper.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">
<mapper namespace="cn.datax.service.data.standard.dao.TypeDao">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.StandardTypeEntity">
<resultMap id="BaseResultMap" type="cn.datax.service.data.standard.api.entity.TypeEntity">
<result column="id" property="id" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
......@@ -25,8 +25,7 @@
create_dept,
update_by,
update_time,
remark,
gb_type_code, gb_type_name
remark, gb_type_code, gb_type_name
</sql>
</mapper>
datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/dto/VisualDataSetDto.java → datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/dto/DataSetDto.java
......@@ -20,7 +20,7 @@ import java.io.Serializable;
*/
@ApiModel(value = "数据集信息表Model")
@Data
public class VisualDataSetDto implements Serializable {
public class DataSetDto implements Serializable {
private static final long serialVersionUID=1L;
......
datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/entity/VisualDataSetEntity.java → datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/entity/DataSetEntity.java
......@@ -4,9 +4,6 @@ import cn.datax.common.base.DataScopeBaseEntity;
import cn.datax.service.data.visual.api.dto.SchemaConfig;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import cn.datax.common.base.BaseEntity;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -24,7 +21,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName(value = "visual_data_set", autoResultMap = true)
public class VisualDataSetEntity extends DataScopeBaseEntity {
public class DataSetEntity extends DataScopeBaseEntity {
private static final long serialVersionUID=1L;
......
datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/query/VisualDataSetQuery.java → datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/query/DataSetQuery.java
......@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class VisualDataSetQuery extends BaseQueryParams {
public class DataSetQuery extends BaseQueryParams {
private static final long serialVersionUID=1L;
......
datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/vo/VisualDataSetVo.java → datax-modules/data-visual-service-parent/data-visual-service-api/src/main/java/cn/datax/service/data/visual/api/vo/DataSetVo.java
......@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
* @since 2020-07-31
*/
@Data
public class VisualDataSetVo implements Serializable {
public class DataSetVo implements Serializable {
private static final long serialVersionUID=1L;
......
datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/controller/VisualDataSetController.java → datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/controller/DataSetController.java
......@@ -5,12 +5,12 @@ import cn.datax.common.core.JsonPage;
import cn.datax.common.core.R;
import cn.datax.common.validate.ValidationGroups;
import cn.datax.service.data.visual.api.dto.SqlParseDto;
import cn.datax.service.data.visual.api.dto.VisualDataSetDto;
import cn.datax.service.data.visual.api.entity.VisualDataSetEntity;
import cn.datax.service.data.visual.api.vo.VisualDataSetVo;
import cn.datax.service.data.visual.api.query.VisualDataSetQuery;
import cn.datax.service.data.visual.mapstruct.VisualDataSetMapper;
import cn.datax.service.data.visual.service.VisualDataSetService;
import cn.datax.service.data.visual.api.dto.DataSetDto;
import cn.datax.service.data.visual.api.entity.DataSetEntity;
import cn.datax.service.data.visual.api.vo.DataSetVo;
import cn.datax.service.data.visual.api.query.DataSetQuery;
import cn.datax.service.data.visual.mapstruct.DataSetMapper;
import cn.datax.service.data.visual.service.DataSetService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -39,13 +39,13 @@ import java.util.stream.Collectors;
@Api(tags = {"数据集信息表"})
@RestController
@RequestMapping("/dataSets")
public class VisualDataSetController extends BaseController {
public class DataSetController extends BaseController {
@Autowired
private VisualDataSetService visualDataSetService;
private DataSetService dataSetService;
@Autowired
private VisualDataSetMapper visualDataSetMapper;
private DataSetMapper dataSetMapper;
/**
* 通过ID查询信息
......@@ -57,67 +57,67 @@ public class VisualDataSetController extends BaseController {
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
@GetMapping("/{id}")
public R getVisualDataSetById(@PathVariable String id) {
VisualDataSetEntity visualDataSetEntity = visualDataSetService.getVisualDataSetById(id);
return R.ok().setData(visualDataSetMapper.toVO(visualDataSetEntity));
DataSetEntity dataSetEntity = dataSetService.getDataSetById(id);
return R.ok().setData(dataSetMapper.toVO(dataSetEntity));
}
@ApiOperation(value = "获取列表", notes = "")
@GetMapping("/list")
public R getVisualDataSetList() {
QueryWrapper<VisualDataSetEntity> queryWrapper = new QueryWrapper<>();
QueryWrapper<DataSetEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", DataConstant.EnableState.ENABLE.getKey());
List<VisualDataSetEntity> list = visualDataSetService.list(queryWrapper);
List<VisualDataSetVo> collect = list.stream().map(visualDataSetMapper::toVO).collect(Collectors.toList());
List<DataSetEntity> list = dataSetService.list(queryWrapper);
List<DataSetVo> collect = list.stream().map(dataSetMapper::toVO).collect(Collectors.toList());
return R.ok().setData(collect);
}
/**
* 分页查询信息
*
* @param visualDataSetQuery
* @param dataSetQuery
* @return
*/
@ApiOperation(value = "分页查询", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "visualDataSetQuery", value = "查询实体visualDataSetQuery", required = true, dataTypeClass = VisualDataSetQuery.class)
@ApiImplicitParam(name = "visualDataSetQuery", value = "查询实体visualDataSetQuery", required = true, dataTypeClass = DataSetQuery.class)
})
@GetMapping("/page")
public R getVisualDataSetPage(VisualDataSetQuery visualDataSetQuery) {
QueryWrapper<VisualDataSetEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(visualDataSetQuery.getSetName()), "set_name", visualDataSetQuery.getSetName());
IPage<VisualDataSetEntity> page = visualDataSetService.page(new Page<>(visualDataSetQuery.getPageNum(), visualDataSetQuery.getPageSize()), queryWrapper);
List<VisualDataSetVo> collect = page.getRecords().stream().map(visualDataSetMapper::toVO).collect(Collectors.toList());
JsonPage<VisualDataSetVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
public R getVisualDataSetPage(DataSetQuery dataSetQuery) {
QueryWrapper<DataSetEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(dataSetQuery.getSetName()), "set_name", dataSetQuery.getSetName());
IPage<DataSetEntity> page = dataSetService.page(new Page<>(dataSetQuery.getPageNum(), dataSetQuery.getPageSize()), queryWrapper);
List<DataSetVo> collect = page.getRecords().stream().map(dataSetMapper::toVO).collect(Collectors.toList());
JsonPage<DataSetVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
return R.ok().setData(jsonPage);
}
/**
* 添加
* @param visualDataSet
* @param dataSet
* @return
*/
@ApiOperation(value = "添加信息", notes = "根据visualDataSet对象添加信息")
@ApiImplicitParam(name = "visualDataSet", value = "详细实体visualDataSet", required = true, dataType = "VisualDataSetDto")
@ApiOperation(value = "添加信息", notes = "根据dataSet对象添加信息")
@ApiImplicitParam(name = "dataSet", value = "详细实体dataSet", required = true, dataType = "DataSetDto")
@PostMapping()
public R saveVisualDataSet(@RequestBody @Validated({ValidationGroups.Insert.class}) VisualDataSetDto visualDataSet) {
VisualDataSetEntity visualDataSetEntity = visualDataSetService.saveVisualDataSet(visualDataSet);
return R.ok().setData(visualDataSetMapper.toVO(visualDataSetEntity));
public R saveVisualDataSet(@RequestBody @Validated({ValidationGroups.Insert.class}) DataSetDto dataSet) {
DataSetEntity dataSetEntity = dataSetService.saveDataSet(dataSet);
return R.ok().setData(dataSetMapper.toVO(dataSetEntity));
}
/**
* 修改
* @param visualDataSet
* @param dataSet
* @return
*/
@ApiOperation(value = "修改信息", notes = "根据url的id来指定修改对象，并根据传过来的信息来修改详细信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path"),
@ApiImplicitParam(name = "visualDataSet", value = "详细实体visualDataSet", required = true, dataType = "VisualDataSetDto")
@ApiImplicitParam(name = "dataSet", value = "详细实体dataSet", required = true, dataType = "DataSetDto")
})
@PutMapping("/{id}")
public R updateVisualDataSet(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) VisualDataSetDto visualDataSet) {
VisualDataSetEntity visualDataSetEntity = visualDataSetService.updateVisualDataSet(visualDataSet);
return R.ok().setData(visualDataSetMapper.toVO(visualDataSetEntity));
public R updateVisualDataSet(@PathVariable String id, @RequestBody @Validated({ValidationGroups.Update.class}) DataSetDto dataSet) {
DataSetEntity dataSetEntity = dataSetService.updateDataSet(dataSet);
return R.ok().setData(dataSetMapper.toVO(dataSetEntity));
}
/**
......@@ -129,7 +129,7 @@ public class VisualDataSetController extends BaseController {
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "String", paramType = "path")
@DeleteMapping("/{id}")
public R deleteVisualDataSetById(@PathVariable String id) {
visualDataSetService.deleteVisualDataSetById(id);
dataSetService.deleteDataSetById(id);
return R.ok();
}
......@@ -142,7 +142,7 @@ public class VisualDataSetController extends BaseController {
@ApiImplicitParam(name = "ids", value = "ID集合", required = true, dataType = "List", paramType = "path")
@DeleteMapping("/batch/{ids}")
public R deleteVisualDataSetBatch(@PathVariable List<String> ids) {
visualDataSetService.deleteVisualDataSetBatch(ids);
dataSetService.deleteDataSetBatch(ids);
return R.ok();
}
......@@ -155,7 +155,7 @@ public class VisualDataSetController extends BaseController {
@ApiImplicitParam(name = "sqlParseDto", value = "SQL解析实体sqlParseDto", required = true, dataType = "SqlParseDto")
@PostMapping("/sql/analyse")
public R sqlAnalyse(@RequestBody @Validated SqlParseDto sqlParseDto) {
List<String> list = visualDataSetService.sqlAnalyse(sqlParseDto);
List<String> list = dataSetService.sqlAnalyse(sqlParseDto);
return R.ok().setData(list);
}
}
datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/dao/VisualDataSetDao.java → datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/dao/DataSetDao.java
package cn.datax.service.data.visual.dao;
import cn.datax.common.base.BaseDao;
import cn.datax.service.data.visual.api.entity.VisualDataSetEntity;
import cn.datax.service.data.visual.api.entity.DataSetEntity;
import org.apache.ibatis.annotations.Mapper;
/**
......@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
* @since 2020-07-31
*/
@Mapper
public interface VisualDataSetDao extends BaseDao<VisualDataSetEntity> {
public interface DataSetDao extends BaseDao<DataSetEntity> {
}
datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/mapstruct/VisualDataSetMapper.java → datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/mapstruct/DataSetMapper.java
package cn.datax.service.data.visual.mapstruct;
import cn.datax.common.mapstruct.EntityMapper;
import cn.datax.service.data.visual.api.dto.VisualDataSetDto;
import cn.datax.service.data.visual.api.entity.VisualDataSetEntity;
import cn.datax.service.data.visual.api.vo.VisualDataSetVo;
import cn.datax.service.data.visual.api.dto.DataSetDto;
import cn.datax.service.data.visual.api.entity.DataSetEntity;
import cn.datax.service.data.visual.api.vo.DataSetVo;
import org.mapstruct.Mapper;
/**
......@@ -15,6 +15,6 @@ import org.mapstruct.Mapper;
* @since 2020-07-31
*/
@Mapper(componentModel = "spring")
public interface VisualDataSetMapper extends EntityMapper<VisualDataSetDto, VisualDataSetEntity, VisualDataSetVo> {
public interface DataSetMapper extends EntityMapper<DataSetDto, DataSetEntity, DataSetVo> {
}
datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/service/VisualDataSetService.java → datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/service/DataSetService.java
package cn.datax.service.data.visual.service;
import cn.datax.service.data.visual.api.dto.SqlParseDto;
import cn.datax.service.data.visual.api.entity.VisualDataSetEntity;
import cn.datax.service.data.visual.api.dto.VisualDataSetDto;
import cn.datax.service.data.visual.api.entity.DataSetEntity;
import cn.datax.service.data.visual.api.dto.DataSetDto;
import cn.datax.common.base.BaseService;
import java.util.List;
......@@ -15,17 +15,17 @@ import java.util.List;
* @author yuwei
* @since 2020-07-31
*/
public interface VisualDataSetService extends BaseService<VisualDataSetEntity> {
public interface DataSetService extends BaseService<DataSetEntity> {
VisualDataSetEntity saveVisualDataSet(VisualDataSetDto visualDataSet);
DataSetEntity saveDataSet(DataSetDto dataSet);
VisualDataSetEntity updateVisualDataSet(VisualDataSetDto visualDataSet);
DataSetEntity updateDataSet(DataSetDto dataSet);
VisualDataSetEntity getVisualDataSetById(String id);
DataSetEntity getDataSetById(String id);
void deleteVisualDataSetById(String id);
void deleteDataSetById(String id);
void deleteVisualDataSetBatch(List<String> ids);
void deleteDataSetBatch(List<String> ids);
List<String> sqlAnalyse(SqlParseDto sqlParseDto);
}
datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/service/impl/VisualDataSetServiceImpl.java → datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/service/impl/DataSetServiceImpl.java
......@@ -3,11 +3,11 @@ package cn.datax.service.data.visual.service.impl;
import cn.datax.common.exception.DataException;
import cn.datax.common.utils.ThrowableUtil;
import cn.datax.service.data.visual.api.dto.SqlParseDto;
import cn.datax.service.data.visual.api.entity.VisualDataSetEntity;
import cn.datax.service.data.visual.api.dto.VisualDataSetDto;
import cn.datax.service.data.visual.service.VisualDataSetService;
import cn.datax.service.data.visual.mapstruct.VisualDataSetMapper;
import cn.datax.service.data.visual.dao.VisualDataSetDao;
import cn.datax.service.data.visual.api.entity.DataSetEntity;
import cn.datax.service.data.visual.api.dto.DataSetDto;
import cn.datax.service.data.visual.service.DataSetService;
import cn.datax.service.data.visual.mapstruct.DataSetMapper;
import cn.datax.service.data.visual.dao.DataSetDao;
import cn.datax.common.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
......@@ -37,46 +37,46 @@ import java.util.List;
@Slf4j
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class VisualDataSetServiceImpl extends BaseServiceImpl<VisualDataSetDao, VisualDataSetEntity> implements VisualDataSetService {
public class DataSetServiceImpl extends BaseServiceImpl<DataSetDao, DataSetEntity> implements DataSetService {
@Autowired
private VisualDataSetDao visualDataSetDao;
private DataSetDao dataSetDao;
@Autowired
private VisualDataSetMapper visualDataSetMapper;
private DataSetMapper dataSetMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public VisualDataSetEntity saveVisualDataSet(VisualDataSetDto visualDataSetDto) {
VisualDataSetEntity visualDataSet = visualDataSetMapper.toEntity(visualDataSetDto);
visualDataSetDao.insert(visualDataSet);
return visualDataSet;
public DataSetEntity saveDataSet(DataSetDto dataSetDto) {
DataSetEntity dataSet = dataSetMapper.toEntity(dataSetDto);
dataSetDao.insert(dataSet);
return dataSet;
}
@Override
@Transactional(rollbackFor = Exception.class)
public VisualDataSetEntity updateVisualDataSet(VisualDataSetDto visualDataSetDto) {
VisualDataSetEntity visualDataSet = visualDataSetMapper.toEntity(visualDataSetDto);
visualDataSetDao.updateById(visualDataSet);
return visualDataSet;
public DataSetEntity updateDataSet(DataSetDto dataSetDto) {
DataSetEntity dataSet = dataSetMapper.toEntity(dataSetDto);
dataSetDao.updateById(dataSet);
return dataSet;
}
@Override
public VisualDataSetEntity getVisualDataSetById(String id) {
VisualDataSetEntity visualDataSetEntity = super.getById(id);
return visualDataSetEntity;
public DataSetEntity getDataSetById(String id) {
DataSetEntity dataSetEntity = super.getById(id);
return dataSetEntity;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteVisualDataSetById(String id) {
visualDataSetDao.deleteById(id);
public void deleteDataSetById(String id) {
dataSetDao.deleteById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteVisualDataSetBatch(List<String> ids) {
visualDataSetDao.deleteBatchIds(ids);
public void deleteDataSetBatch(List<String> ids) {
dataSetDao.deleteBatchIds(ids);
}
@Override
......
datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/mapper/VisualDataSetMapper.xml → datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/mapper/DataSetDao.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.visual.dao.VisualDataSetDao">
<mapper namespace="cn.datax.service.data.visual.dao.DataSetDao">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.datax.service.data.visual.api.entity.VisualDataSetEntity">
<resultMap id="BaseResultMap" type="cn.datax.service.data.visual.api.entity.DataSetEntity">
<result column="id" property="id" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment