数据开发模块

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -23,4 +24,10 @@ public class DataProductionTreeController {
         List<DataProductionTreeVo> dispositionVos=dataProductionService.dataTreeList();
         return Result.ok(dispositionVos);
     }
+
+    @PostMapping
+    public Result add(@RequestBody DataProductionTreeDto dataProductionTreeDto){
+        dataProductionService.add(dataProductionTreeDto);
+        return Result.ok();
+    }
 }

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<DataProductionTreeVo> convert(List<DataProductionTreeEntity> dataProductionTreeEntities);
+
+    DataProductionTreeEntity convert(DataProductionTreeDto dataProductionTreeDto);
 }

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 {
+public class DataProductionTreeEntity {
-    private Long parentId;
+    @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;
 }

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<DataProductionTreeEntity> {
     List<DataProductionTreeVo> dataTreeList();
 
+    void add(DataProductionTreeDto dataProductionTreeDto);
+
 }

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<DataProductionMapper, DataProductionTreeEntity> implements DataProductionService {
     @Override
     public List<DataProductionTreeVo> dataTreeList() {
+        ArrayList<DataProductionTreeVo> dataProductionTreeVoArrayList = new ArrayList<>();
         List<DataProductionTreeEntity> dataProductionTreeEntities = baseMapper.selectList(null);
         for (DataProductionTreeEntity dataProductionTreeEntity : dataProductionTreeEntities) {
             List<DataProductionTreeVo> dataProductionTreeVos=findDataProductTreeVoList(dataProductionTreeEntity);
+            DataProductionTreeVo convert = DataProductionTreeConvert.INSTANCE.convert(dataProductionTreeEntity);
+            convert.setDataProductionTreeVos(dataProductionTreeVos);
+            dataProductionTreeVoArrayList.add(convert);
         }
-        return null;
+        return dataProductionTreeVoArrayList;
     }
 
     private List<DataProductionTreeVo> findDataProductTreeVoList(DataProductionTreeEntity dataProductionTreeEntity) {
-        List<DataProductionTreeVo> dataProductionTreeVos=new ArrayList<>();
         QueryWrapper<DataProductionTreeEntity> dataProductionTreeEntityQueryWrapper = new QueryWrapper<>();
         dataProductionTreeEntityQueryWrapper.eq("parent_id",dataProductionTreeEntity.getId());
         List<DataProductionTreeEntity> dataProductionTreeEntities = baseMapper.selectList(dataProductionTreeEntityQueryWrapper);
-
+        List<DataProductionTreeVo> convert = DataProductionTreeConvert.INSTANCE.convert(dataProductionTreeEntities);
-        return null;
+        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);
+    }
+
 }

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 Integer id;
-    private Long parentId;
+    private Integer parentId;
     private Integer ifLeaf;
     private Long taskId;
     private String taskType;