mirror of
https://github.com/dataease/dataease.git
synced 2026-05-23 13:58:26 +08:00
Merge pull request #6993 from dataease/pr@dev-v2@refactor_template-manage
Pr@dev v2@refactor template manage
This commit is contained in:
@@ -17,12 +17,18 @@ public interface TemplateManageApi {
|
||||
@PostMapping("/delete/{id}")
|
||||
void delete(@PathVariable String id);
|
||||
|
||||
@PostMapping("/deleteCategory/{id}")
|
||||
void deleteCategory(@PathVariable String id);
|
||||
|
||||
@GetMapping("/findOne/{templateId}")
|
||||
VisualizationTemplateVO findOne(@PathVariable String templateId) throws Exception;
|
||||
|
||||
@PostMapping("/find")
|
||||
List<TemplateManageDTO> find(@RequestBody TemplateManageRequest request);
|
||||
|
||||
@PostMapping("/findCategories")
|
||||
List<TemplateManageDTO> findCategories(@RequestBody TemplateManageRequest request);
|
||||
|
||||
@PostMapping("/nameCheck")
|
||||
String nameCheck(@RequestBody TemplateManageRequest request);
|
||||
|
||||
|
||||
@@ -20,5 +20,9 @@ public class TemplateManageDTO extends VisualizationTemplateVO {
|
||||
|
||||
private List<TemplateManageDTO> children;
|
||||
|
||||
private List<String> categories;
|
||||
|
||||
private List<String> categoryNames;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@@ -42,10 +43,10 @@ public class TemplateMarketDTO implements Comparable<TemplateMarketDTO> {
|
||||
this.id = manageDTO.getId();
|
||||
this.title = manageDTO.getName();
|
||||
this.mainCategory = manageDTO.getCategoryName();
|
||||
this.categories = Arrays.asList(new MarketCategoryVO(manageDTO.getCategoryName()));
|
||||
this.categoryNames = Arrays.asList(manageDTO.getCategoryName());
|
||||
this.categories = manageDTO.getCategoryNames().stream().map(category->new MarketCategoryVO(category)).collect(Collectors.toList());
|
||||
this.categoryNames = manageDTO.getCategoryNames();
|
||||
this.metas = new MarketMetasVO(manageDTO.getSnapshot());
|
||||
this.templateType = "dataV".equalsIgnoreCase("manageDTO.getTemplateType()") ? "SCREEN" : "PANEL";
|
||||
this.templateType = "dataV".equalsIgnoreCase(manageDTO.getTemplateType()) ? "SCREEN" : "PANEL";
|
||||
this.thumbnail = manageDTO.getSnapshot();
|
||||
this.source = "manage";
|
||||
if (manageDTO.getRecentUseTime() != null) {
|
||||
|
||||
@@ -3,6 +3,8 @@ package io.dataease.api.template.request;
|
||||
import io.dataease.api.template.vo.VisualizationTemplateVO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Author: wangjiahao
|
||||
* Date: 2021-03-05
|
||||
@@ -21,7 +23,12 @@ public class TemplateManageRequest extends VisualizationTemplateVO {
|
||||
|
||||
private String leafDvType;
|
||||
|
||||
private String categoryId;
|
||||
|
||||
private List<String> categories;
|
||||
|
||||
public TemplateManageRequest() {
|
||||
|
||||
}
|
||||
|
||||
public TemplateManageRequest(String pid,String dvType) {
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
package io.dataease.api.template.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author : WangJiaHao
|
||||
* @date : 2023/11/7 13:22
|
||||
*/
|
||||
@Data
|
||||
public class VisualizationTemplateCategoryVO {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 父级id
|
||||
*/
|
||||
private String pid;
|
||||
|
||||
/**
|
||||
* 层级
|
||||
*/
|
||||
private Integer level;
|
||||
|
||||
/**
|
||||
* 模板种类 dataV or dashboard 目录或者文件夹
|
||||
*/
|
||||
private String dvType;
|
||||
|
||||
/**
|
||||
* 节点类型 folder or panel 目录或者文件夹
|
||||
*/
|
||||
private String nodeType;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Long createTime;
|
||||
|
||||
/**
|
||||
* 缩略图
|
||||
*/
|
||||
private String snapshot;
|
||||
}
|
||||
Reference in New Issue
Block a user