diff --git a/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar index 18326ec..3f435fa 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar and b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar index 92b0d59..273eff8 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar index da5b46b..3786216 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar differ diff --git a/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java b/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java index a104c12..b13dd46 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java +++ b/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java @@ -1,13 +1,14 @@ package net.srt.disposition.controller; import lombok.AllArgsConstructor; +import net.srt.api.module.data.integrate.dto.DataDatabaseDto; +import net.srt.disposition.dto.DataProductionTreeDto; +import net.srt.disposition.dto.DispositionDto; import net.srt.disposition.service.DataProductionService; import net.srt.disposition.vo.DataProductionTreeVo; import net.srt.disposition.vo.DispositionVo; import net.srt.framework.common.utils.Result; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,4 +24,10 @@ public class DataProductionTreeController { List dispositionVos=dataProductionService.dataTreeList(); return Result.ok(dispositionVos); } + + @PostMapping + public Result add(@RequestBody DataProductionTreeDto dataProductionTreeDto){ + dataProductionService.add(dataProductionTreeDto); + return Result.ok(); + } } diff --git a/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java b/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java index ead7b57..4d42a00 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java +++ b/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java @@ -1,15 +1,22 @@ package net.srt.disposition.convert; +import net.srt.disposition.dto.DataProductionTreeDto; import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.entity.DataProductionTreeEntity; import net.srt.disposition.entity.DispositionEntity; +import net.srt.disposition.vo.DataProductionTreeVo; import net.srt.disposition.vo.DispositionVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + @Mapper public interface DataProductionTreeConvert { DataProductionTreeConvert INSTANCE = Mappers.getMapper(DataProductionTreeConvert.class); - DispositionVo convert(DispositionEntity entity); + DataProductionTreeVo convert(DataProductionTreeEntity entity); - DispositionEntity convert(DispositionDto vo); + List convert(List dataProductionTreeEntities); + + DataProductionTreeEntity convert(DataProductionTreeDto dataProductionTreeDto); } diff --git a/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java b/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java index 6622a6f..28518ea 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java +++ b/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java @@ -1,13 +1,20 @@ package net.srt.disposition.entity; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import net.srt.framework.mybatis.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data @TableName("data_production_tree") -public class DataProductionTreeEntity extends BaseEntity { - private Long parentId; +public class DataProductionTreeEntity { + @TableId("id") + private Integer id; + private Integer parentId; private Integer ifLeaf; private Long taskId; private String taskType; @@ -22,4 +29,8 @@ public class DataProductionTreeEntity extends BaseEntity { private Boolean builtin; private String description; private Long projectId; + private Integer creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; } diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java b/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java index 85a507b..1230b9b 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java +++ b/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java @@ -1,6 +1,9 @@ package net.srt.disposition.service; import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.api.module.data.integrate.dto.DataDatabaseDto; +import net.srt.disposition.dto.DataProductionTreeDto; +import net.srt.disposition.dto.DispositionDto; import net.srt.disposition.entity.DataProductionTreeEntity; import net.srt.disposition.vo.DataProductionTreeVo; @@ -9,4 +12,6 @@ import java.util.List; public interface DataProductionService extends IService { List dataTreeList(); + void add(DataProductionTreeDto dataProductionTreeDto); + } diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java index 6cffcaf..ee3b990 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java +++ b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java @@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import net.srt.Fink.entity.FinkEntity; +import net.srt.api.module.data.integrate.dto.DataDatabaseDto; +import net.srt.disposition.convert.DataProductionTreeConvert; +import net.srt.disposition.dto.DataProductionTreeDto; +import net.srt.disposition.dto.DispositionDto; import net.srt.disposition.entity.DataProductionTreeEntity; import net.srt.disposition.mapper.DataProductionMapper; import net.srt.disposition.service.DataProductionService; @@ -20,19 +24,36 @@ import java.util.List; public class DataProductionServiceImpl extends BaseServiceImpl implements DataProductionService { @Override public List dataTreeList() { + ArrayList dataProductionTreeVoArrayList = new ArrayList<>(); List dataProductionTreeEntities = baseMapper.selectList(null); for (DataProductionTreeEntity dataProductionTreeEntity : dataProductionTreeEntities) { List dataProductionTreeVos=findDataProductTreeVoList(dataProductionTreeEntity); + DataProductionTreeVo convert = DataProductionTreeConvert.INSTANCE.convert(dataProductionTreeEntity); + convert.setDataProductionTreeVos(dataProductionTreeVos); + dataProductionTreeVoArrayList.add(convert); } - return null; + return dataProductionTreeVoArrayList; } private List findDataProductTreeVoList(DataProductionTreeEntity dataProductionTreeEntity) { - List dataProductionTreeVos=new ArrayList<>(); QueryWrapper dataProductionTreeEntityQueryWrapper = new QueryWrapper<>(); dataProductionTreeEntityQueryWrapper.eq("parent_id",dataProductionTreeEntity.getId()); List dataProductionTreeEntities = baseMapper.selectList(dataProductionTreeEntityQueryWrapper); - - return null; + List convert = DataProductionTreeConvert.INSTANCE.convert(dataProductionTreeEntities); + return convert; } + + @Override + public void add(DataProductionTreeDto dataProductionTreeDto) { + DataProductionTreeEntity convert = DataProductionTreeConvert.INSTANCE.convert(dataProductionTreeDto); + if (convert.getParentPath()!=null && !convert.getParentPath().equals("")){ + String path=convert.getParentPath()+"/"+convert.getName(); + convert.setPath(path); + baseMapper.insert(convert); + } + convert.setLabel(convert.getName()); + convert.setPath(convert.getName()); + baseMapper.insert(convert); + } + } diff --git a/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java index d1e4ae4..24b24c1 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java +++ b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java @@ -11,8 +11,8 @@ import java.util.List; @Data public class DataProductionTreeVo { - private Long id; - private Long parentId; + private Integer id; + private Integer parentId; private Integer ifLeaf; private Long taskId; private String taskType;